diff --git a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
index afb26c8624..27aee39385 100644
--- a/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
+++ b/source/java/org/alfresco/web/bean/content/DocumentDetailsDialog.java
@@ -234,11 +234,25 @@ public class DocumentDetailsDialog extends BaseDetailsBean implements  Navigatio
    }
 
    /**
-    * Adds the node to the dispatch context so that overridden dialogs can be picked up
+    * Fixes an issue reported in https://issues.alfresco.com/jira/browse/ETWOONE-92
+    * 
+    * @return Returns action 
     */
-   public void setupEditContext(ActionEvent event)
+   public String editContentProperties()
    {
-      this.navigator.setupDispatchContext(getDocument());
+       NodeRef nodeRef = getDocument().getNodeRef();
+       if (this.getNodeService().exists(nodeRef))
+       {
+           navigator.setupDispatchContext(getDocument());
+           return "dialog:editContentProperties";
+       }
+       else
+       {
+           Utils.addErrorMessage(MessageFormat.format(Application.getMessage(
+               FacesContext.getCurrentInstance(), Repository.ERROR_NODEREF), new Object[] {nodeRef}) );
+           return "browse";
+       }
+       
    }
 
    /**
diff --git a/source/web/jsp/content/document-details.jsp b/source/web/jsp/content/document-details.jsp
index da5ef3a11a..52940f9efb 100644
--- a/source/web/jsp/content/document-details.jsp
+++ b/source/web/jsp/content/document-details.jsp
@@ -96,7 +96,7 @@
 <h:panelGroup id="props-panel-facets">
    <f:facet name="title">
       <r:permissionEvaluator value="#{DialogManager.bean.document}" allow="Write">
-         <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/edit_properties.gif" action="dialog:editContentProperties" actionListener="#{DialogManager.bean.setupEditContext}" />
+         <a:actionLink id="titleLink1" value="#{msg.modify}" showLink="false" image="/images/icons/edit_properties.gif" action="#{DialogManager.bean.editContentProperties}" />
       </r:permissionEvaluator>
    </f:facet>
 </h:panelGroup>