diff --git a/core/src/zeit/content/gallery/gallery.py b/core/src/zeit/content/gallery/gallery.py
index 4b8123988b..682f2bb203 100644
--- a/core/src/zeit/content/gallery/gallery.py
+++ b/core/src/zeit/content/gallery/gallery.py
@@ -170,6 +170,8 @@ def items(self):
         return list(zip(list(self.keys()), list(self.values())))
 
     def __len__(self):
+        if self._image_folder is None:
+            return 0
         return int(self._entries_container.xpath('count(block)'))
 
     def __setitem__(self, key, value):
@@ -185,8 +187,8 @@ def __setitem__(self, key, value):
         self._p_changed = True
 
     def updateOrder(self, order):
-        if set(self.keys()) != set(order):
-            raise ValueError('The order argument must contain the same ' 'keys as the container.')
+        if order is None or set(self.keys()) != set(order):
+            raise ValueError('The order argument must contain the same keys as the container.')
         order = [self._get_block_for_key(x) for x in order]
         for node in self._entries_container.iterchildren():
             self._entries_container.remove(node)