diff --git a/source/java/org/alfresco/web/bean/UserShortcutsBean.java b/source/java/org/alfresco/web/bean/UserShortcutsBean.java
index a6097352dc..7934624a19 100644
--- a/source/java/org/alfresco/web/bean/UserShortcutsBean.java
+++ b/source/java/org/alfresco/web/bean/UserShortcutsBean.java
@@ -342,6 +342,11 @@ public class UserShortcutsBean
       {
          if (permissionService.hasPermission(selectedNode.getNodeRef(), PermissionService.READ) == AccessStatus.ALLOWED)
          {
+            if (nodeService.exists(selectedNode.getNodeRef()) == false)
+            {
+               throw new InvalidNodeRefException(selectedNode.getNodeRef());
+            }
+            
             DictionaryService dd = Repository.getServiceRegistry(FacesContext.getCurrentInstance()).getDictionaryService();
             if (dd.isSubClass(selectedNode.getType(), ContentModel.TYPE_FOLDER))
             {