diff --git a/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java b/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java
index 2e960b87e5..97b7744829 100644
--- a/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java
+++ b/source/java/org/alfresco/web/bean/categories/CategoriesDialog.java
@@ -483,12 +483,15 @@ public class CategoriesDialog extends BaseDialogBean implements IContextListener
             this.setCurrentCategory(handler.nodeRef); 
          }
       }
-      else 
+      else
       {
-          handler = new CategoryBreadcrumbHandler(
+         if (getCategory() != null)
+         {
+            handler = new CategoryBreadcrumbHandler(
                   getCategory().getNodeRef(), Repository.getNameForNode(getNodeService(), getCategory().getNodeRef()));
-          location.set(location.size() - 1, handler);
-          this.setCurrentCategory(handler.nodeRef); 
+            location.set(location.size() - 1, handler);
+            this.setCurrentCategory(handler.nodeRef);
+         }
       }
    }