Showing with 5 additions and 2 deletions.

+4 −1 src/core/qgsgeometry.cpp

+1 −1 src/core/qgsvectorlayer.cpp
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
@@ -3607,7 +3607,10 @@ QgsRectangle QgsGeometry::boundingBox()
   if ( !mGeometry )
   {
     QgsDebugMsg( "WKB geometry not available!" );
-    return QgsRectangle( 0, 0, 0, 0 );
+    // Return minimal QgsRectangle
+    QgsRectangle invalidRect;
+    invalidRect.setMinimal();
+    return invalidRect;
   }
 
   // consider endian when fetching feature type

diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
@@ -1161,7 +1161,7 @@ QgsRectangle QgsVectorLayer::extent()
     QgsFeature fet;
     while ( fit.nextFeature( fet ) )
     {
-      if ( fet.geometry() )
+      if ( fet.geometry() && fet.geometry()->type() != QGis::UnknownGeometry )
       {
         QgsRectangle bb = fet.geometry()->boundingBox();
         rect.combineExtentWith( &bb );