diff --git a/lib/OpenLayers/Layer/Vector.js b/lib/OpenLayers/Layer/Vector.js
index 8ac538eda9..16751b4f57 100644
--- a/lib/OpenLayers/Layer/Vector.js
+++ b/lib/OpenLayers/Layer/Vector.js
@@ -807,14 +807,17 @@ OpenLayers.Layer.Vector = OpenLayers.Class(OpenLayers.Layer, {
      */
     getDataExtent: function () {
         var maxExtent = null;
-
-        if(this.features && (this.features.length > 0)) {
+        var features = this.features;
+        if(features && (features.length > 0)) {
             maxExtent = new OpenLayers.Bounds();
-            for(var i=0, len=this.features.length; i<len; i++) {
-                maxExtent.extend(this.features[i].geometry.getBounds());
+            var geometry = null;
+            for(var i=0, len=features.length; i<len; i++) {
+                geometry = features[i].geometry;
+                if (geometry) {
+                    maxExtent.extend(geometry.getBounds());
+                }
             }
         }
-
         return maxExtent;
     },