diff --git a/source/java/org/alfresco/web/bean/BrowseBean.java b/source/java/org/alfresco/web/bean/BrowseBean.java
index c2a58f6cf4..6e7370a338 100644
--- a/source/java/org/alfresco/web/bean/BrowseBean.java
+++ b/source/java/org/alfresco/web/bean/BrowseBean.java
@@ -229,9 +229,12 @@ public class BrowseBean implements IContextListener
     */
    public void setActionSpace(Node actionSpace)
    {
-      for (NodeEventListener listener : getNodeEventListeners())
+      if (actionSpace != null)
       {
-         listener.created(actionSpace, actionSpace.getType());
+         for (NodeEventListener listener : getNodeEventListeners())
+         {
+            listener.created(actionSpace, actionSpace.getType());
+         }
       }
       this.actionSpace = actionSpace;
    }