diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index 2d8d03caad..f5736c5c2c 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -111,14 +111,18 @@ OpenLayers.Map.prototype = {
     /**
     */
     destroy:function() {
-        for(var i=0; i< this.layers.length; i++) {
-            this.layers[i].destroy();
-        } 
-        this.layers = null;
-        for(var i=0; i< this.controls.length; i++) {
-            this.controls[i].destroy();
-        } 
-        this.controls = null;
+        if (this.layers != null) {
+            for(var i=0; i< this.layers.length; i++) {
+                this.layers[i].destroy();
+            } 
+            this.layers = null;
+        }
+        if (this.controls != null) {
+            for(var i=0; i< this.controls.length; i++) {
+                this.controls[i].destroy();
+            } 
+            this.controls = null;
+        }
     },
 
     /**