diff --git a/UI/TextureUtil.cpp b/UI/TextureUtil.cpp
index 3fdd3d82a1..b2a41fba52 100644
--- a/UI/TextureUtil.cpp
+++ b/UI/TextureUtil.cpp
@@ -200,6 +200,11 @@ std::unique_ptr<ManagedTexture> CreateTextureFromFileData(Draw::DrawContext *dra
 	if (!draw)
 		return std::unique_ptr<ManagedTexture>();
 	ManagedTexture *mtex = new ManagedTexture(draw);
-	mtex->LoadFromFileData(data, size, type, generateMips);
-	return std::unique_ptr<ManagedTexture>(mtex);
+	if (mtex->LoadFromFileData(data, size, type, generateMips)) {
+		return std::unique_ptr<ManagedTexture>(mtex);
+	} else {
+		// Best to return a null pointer if we fail!
+		delete mtex;
+		return std::unique_ptr<ManagedTexture>();
+	}
 }