From 82b5bbc283d0476d3fbddf8f199211a7a1aaa9d9 Mon Sep 17 00:00:00 2001
From: Kurt Loeffler <kurtloeffler@gmail.com>
Date: Sat, 26 Dec 2015 15:52:48 -0800
Subject: [PATCH] Verify image has been loaded correctly.

---
 plugins/ImageReader/ImageReader.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/plugins/ImageReader/ImageReader.py b/plugins/ImageReader/ImageReader.py
index e39fd5465e..f12b6355c7 100644
--- a/plugins/ImageReader/ImageReader.py
+++ b/plugins/ImageReader/ImageReader.py
@@ -12,6 +12,7 @@ from UM.Mesh.MeshData import MeshData
 from UM.Scene.SceneNode import SceneNode
 from UM.Math.Vector import Vector
 from UM.Job import Job
+from UM.Logger import Logger
 from .ImageReaderUI import ImageReaderUI
 
 
@@ -42,6 +43,11 @@ class ImageReader(MeshReader):
         scene_node.setMeshData(mesh)
 
         img = QImage(file_name)
+
+        if img.isNull():
+            Logger.log("e", "Image is corrupt.")
+            return None
+
         width = max(img.width(), 2)
         height = max(img.height(), 2)
         aspect = height / width