diff --git a/src/client/tile.cpp b/src/client/tile.cpp
index a29a6611a..14fc316e7 100644
--- a/src/client/tile.cpp
+++ b/src/client/tile.cpp
@@ -1869,6 +1869,11 @@ bool TextureSource::generateImagePart(std::string part_of_name,
 			video::IImage* pngimg = vd->createImageFromFile(memfile);
 			memfile->drop();
 
+			if (!pngimg) {
+				errorstream << "generateImagePart(): Invalid PNG data" << std::endl;
+				return false;
+			}
+
 			if (baseimg) {
 				blitBaseImage(pngimg, baseimg);
 			} else {