diff --git a/server.py b/server.py
index 633e062..4781eab 100755
--- a/server.py
+++ b/server.py
@@ -37,6 +37,8 @@ def generatePicture(pathToOrig, scaleX, scaleY, encoding, crop):
         image = PIL.Image.open(os.path.join(PICTURE_DIR, pathToOrig))
     except FileNotFoundError:
         return (None, False)
+    except PIL.UnidentifiedImageError:
+        return (os.path.join(PICTURE_DIR, pathToOrig), False)
 
     # ensure sizes are valid #
     x, y = image.size