diff --git a/tests/createImage.cpp b/tests/createImage.cpp
index 36885c89..55cb57e0 100644
--- a/tests/createImage.cpp
+++ b/tests/createImage.cpp
@@ -13,16 +13,34 @@ bool testImageCreation()
 	if (device == 0)
 		return true; // could not create selected driver.
 
+	bool result = true;
 	video::IVideoDriver* driver = device->getVideoDriver();
 	video::ITexture* tex=driver->getTexture("../media/water.jpg");
-	video::IImage* img1=driver->createImage(tex, core::vector2di(0,0), core::dimension2du(32,32));
-	video::ITexture* tex1=driver->addTexture("new1", img1);
-	img1->drop();
-	img1=0;
-	video::IImage* img2=driver->createImage(tex, core::vector2di(0,0), tex->getSize());
-	video::ITexture* tex2=driver->addTexture("new2", img2);
-	img2->drop();
-	img2 = 0;
+	video::ITexture* tex1=0;
+	video::ITexture* tex2=0;
+	if (!tex)
+		result=false;
+	else
+	{
+		video::IImage* img1=driver->createImage(tex, core::vector2di(0,0), core::dimension2du(32,32));
+		if (!img1)
+			result=false;
+		else
+		{
+			tex1=driver->addTexture("new1", img1);
+			img1->drop();
+			img1=0;
+		}
+		video::IImage* img2=driver->createImage(tex, core::vector2di(0,0), tex->getSize());
+		if (!img2)
+			result=false;
+		else
+		{
+			tex2=driver->addTexture("new2", img2);
+			img2->drop();
+			img2 = 0;
+		}
+	}
 
 	driver->beginScene(true, true, video::SColor(255,255,0,255));//Backbuffer background is pink
 
@@ -32,7 +50,7 @@ bool testImageCreation()
 
 	driver->endScene();
 
-	bool result = takeScreenshotAndCompareAgainstReference(driver, "-createImage.png");
+	result = takeScreenshotAndCompareAgainstReference(driver, "-createImage.png");
 
 	device->closeDevice();
 	device->run();
@@ -73,3 +91,4 @@ bool createImage()
 	result &= testImageFormats();
 	return result;
 }
+