diff --git a/scripts/geodata/polygons/index.py b/scripts/geodata/polygons/index.py
index c3b166a1..4f4ea8fd 100644
--- a/scripts/geodata/polygons/index.py
+++ b/scripts/geodata/polygons/index.py
@@ -248,7 +248,7 @@ class PolygonIndex(object):
                 poly = Polygon(coords[0])
                 polys.append(poly)
 
-            return prep(MultiPolygon(polys))
+            return MultiPolygon(polys)
 
     @classmethod
     def load_polygons(cls, filename):
@@ -301,7 +301,7 @@ class PolygonIndex(object):
             containing = []
 
         for i in candidates:
-            poly = self.polygons.get(i)
+            poly = self.polygons.get(i, None)
             data = {}
             if poly is None:
                 data = json.loads(self.polygons_db.Get(str(i)))