1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
index 72ba4f18f6..0e906796b8 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/internal/cdo/view/AbstractCDOView.java
@@ -883,6 +883,11 @@ public abstract class AbstractCDOView extends Lifecycle implements InternalCDOVi
     checkActive();
     CDOObject object = CDOUtil.getCDOObject(objectFromDifferentView);
     CDOView view = object.cdoView();
+    if (view == null)
+    {
+      return null;
+    }
+
     if (view != this)
     {
       if (!view.getSession().getRepositoryInfo().getUUID().equals(getSession().getRepositoryInfo().getUUID()))