1 files changed, 7 insertions, 1 deletions
diff --git a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
index e7d5514499..03b67ebec6 100644
--- a/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
+++ b/plugins/org.eclipse.emf.cdo.edit/src/org/eclipse/emf/cdo/edit/CDOItemProviderAdapter.java
@@ -936,7 +936,13 @@ public class CDOItemProviderAdapter extends ItemProviderAdapter
       if (object instanceof EObject)
       {
         CDOObject cdoObject = CDOUtil.getCDOObject((EObject)object);
-        return cdoObject.eResource().getURI().toString() + "#" + cdoObject.cdoID().toURIFragment(); //$NON-NLS-1$
+        Resource resource = cdoObject.eResource();
+        if (resource != null)
+        {
+          CDOID id = cdoObject.cdoID();
+          String fragment = id != null ? id.toURIFragment() : resource.getURIFragment(cdoObject);
+          return resource.getURI().appendFragment(fragment).toString();
+        }
       }
 
       return null;