diff --git a/librtt/Display/Rtt_TextureFactory.cpp b/librtt/Display/Rtt_TextureFactory.cpp
index 0271f72b9..6f6253495 100644
--- a/librtt/Display/Rtt_TextureFactory.cpp
+++ b/librtt/Display/Rtt_TextureFactory.cpp
@@ -277,7 +277,13 @@ TextureFactory::FindOrCreate(
 	if ( result.IsNull() )
 	{
 		PlatformBitmap *bitmap = CreateBitmap( filePath.GetString(), flags, isMask );
-		result = CreateAndAdd( key, bitmap, true, isRetina );
+
+		if ( bitmap )
+		{
+			result = CreateAndAdd( key, bitmap, true, isRetina );
+		} else {
+			Rtt_ASSERT( result.IsNull() );
+		}
 	}
 
 	return result;
diff --git a/platform/emscripten/Rtt_EmscriptenBitmap.cpp b/platform/emscripten/Rtt_EmscriptenBitmap.cpp
index 5cd8597b9..58cbbbcde 100644
--- a/platform/emscripten/Rtt_EmscriptenBitmap.cpp
+++ b/platform/emscripten/Rtt_EmscriptenBitmap.cpp
@@ -186,6 +186,10 @@ namespace Rtt
 			{
 				fFormat = kRGBA;
 			}
+			else
+			{
+				Rtt_LogException("Failed to load %s\n", path);
+			}
 		}
 		else
 		if (ext == ".png")
diff --git a/platform/linux/src/Rtt_LinuxBitmap.cpp b/platform/linux/src/Rtt_LinuxBitmap.cpp
index 0a2aa7807..3076d5ef4 100644
--- a/platform/linux/src/Rtt_LinuxBitmap.cpp
+++ b/platform/linux/src/Rtt_LinuxBitmap.cpp
@@ -125,6 +125,10 @@ namespace Rtt
 			{
 				fFormat = kRGBA;
 			}
+			else
+			{
+				Rtt_LogException("Failed to load %s\n", path);
+			}
 		}
 		else if (ext == ".png")
 		{
diff --git a/platform/shared/Rtt_BitmapUtils.cpp b/platform/shared/Rtt_BitmapUtils.cpp
index d4e9782a2..ad49ceae2 100644
--- a/platform/shared/Rtt_BitmapUtils.cpp
+++ b/platform/shared/Rtt_BitmapUtils.cpp
@@ -238,6 +238,8 @@ namespace bitmapUtil
 			format = Rtt::PlatformBitmap::Format::kRGBA;
 			return im;
 		}
+
+		return NULL;
 	}
 
 	//