diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js
index abd47d1dd8..1d1646affb 100644
--- a/lib/OpenLayers/Map.js
+++ b/lib/OpenLayers/Map.js
@@ -594,13 +594,12 @@ OpenLayers.Map = OpenLayers.Class({
         
         // add any initial layers
         if (options && options.layers) {
-            this.addLayers(options.layers);
-        }
-        
-        // set center (and optionally zoom)
-        if (options && options.center) {
-            // zoom can be undefined here
-            this.setCenter(options.center, options.zoom);
+            this.addLayers(options.layers);        
+            // set center (and optionally zoom)
+            if (options.center) {
+                // zoom can be undefined here
+                this.setCenter(options.center, options.zoom);
+            }
         }
     },
     
diff --git a/tests/Map.html b/tests/Map.html
index 3b0f435339..e2a2dddc8a 100644
--- a/tests/Map.html
+++ b/tests/Map.html
@@ -1557,19 +1557,19 @@
         var map, msg;
         
         
-        // try setting center without layers, this is not supported
+        // try setting center without layers, this has no effect
         var failed = false;
         try {
             map = new OpenLayers.Map({
                 div: "map",
                 center: new OpenLayers.LonLat(1, 2)
             });
-            msg = "center set with no layers";
+            msg = "center option without layers has no effect";
         } catch (err) {
             failed = true;
-            msg = "center cannot be set without layers";
+            msg = "center option without layers throws error";
         }
-        t.ok(failed, msg);
+        t.ok(!failed, msg);
         
         if (map) {
             map.destroy();