[BUGFIX] Handle errors when retrieving geometry data - master_2

core/project_finder.py

@@ -307,16 +307,19 @@ def expressionIterator(self, layer, expression, geometryStorage):
             evaluated = unicode(qgsExpression.evaluate(f))
             if qgsExpression.hasEvalError():
                 continue
-            if f.geometry() is None or f.geometry().centroid() is None:
+            try:
+                if f.geometry() is None or f.geometry().centroid() is None:
+                    continue
+                centroid = f.geometry().centroid().asPoint()
+                if geometryStorage == 'wkb':
+                    geom = binascii.b2a_hex(f.geometry().asWkb())
+                elif geometryStorage == 'wkt':
+                    geom = f.geometry().exportToWkt()
+                else:
+                    geom = f.geometry().boundingBox().asWktPolygon()
+                yield ( evaluated, centroid.x(), centroid.y(), geom )
+            except:
                 continue
-            centroid = f.geometry().centroid().asPoint()
-            if geometryStorage == 'wkb':
-                geom = binascii.b2a_hex(f.geometry().asWkb())
-            elif geometryStorage == 'wkt':
-                geom = f.geometry().exportToWkt()
-            else:
-                geom = f.geometry().boundingBox().asWktPolygon()
-            yield ( evaluated, centroid.x(), centroid.y(), geom )
 
     def stop_record(self):
         self.stopLoop = True