diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js
index 045e1705f2..2d84a7a794 100644
--- a/lib/OpenLayers/Layer.js
+++ b/lib/OpenLayers/Layer.js
@@ -131,7 +131,9 @@ OpenLayers.Layer.prototype = {
      */
     setName: function(newName) {
         this.name = newName;
-        this.map.events.triggerEvent("changelayer");
+        // assuming a map has been assigned, trigger changelayer
+        if (this.map != null)
+            this.map.events.triggerEvent("changelayer");
     },    
     
    /**