diff --git a/Tests/test_image.py b/Tests/test_image.py
index afeacb0a0..ddd0370d7 100644
--- a/Tests/test_image.py
+++ b/Tests/test_image.py
@@ -29,6 +29,7 @@ class TestImage(PillowTestCase):
         self.assertEqual(im3.getcolors(), [(10000, 0)])
 
         self.assertRaises(ValueError, lambda: Image.new("X", (100, 100)))
+        self.assertRaises(ValueError, lambda: Image.new("", (100, 100)))
         # self.assertRaises(
         #     MemoryError, lambda: Image.new("L", (1000000, 1000000)))
 
diff --git a/libImaging/Storage.c b/libImaging/Storage.c
index 27661bfdb..fb27572d3 100644
--- a/libImaging/Storage.c
+++ b/libImaging/Storage.c
@@ -398,6 +398,9 @@ ImagingNew(const char* mode, int xsize, int ysize)
     int bytes;
     Imaging im;
 
+    if (strcmp(mode, "") == 0)
+        return (Imaging) ImagingError_ValueError("empty mode");
+
     if (strlen(mode) == 1) {
         if (mode[0] == 'F' || mode[0] == 'I')
             bytes = 4;