1 files changed, 5 insertions, 0 deletions
diff --git a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java
index 20f38f0f32..06c7423266 100644
--- a/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java
+++ b/plugins/org.eclipse.emf.cdo/src/org/eclipse/emf/spi/cdo/AbstractChangeSetsConflictResolver.java
@@ -89,6 +89,11 @@ public abstract class AbstractChangeSetsConflictResolver extends AbstractConflic
   public CDOChangeSet getRemoteChangeSet()
   {
     CDOChangeSetData changeSetData = remoteInvalidationEvents.getChangeSetData();
+    if (changeSetData == null)
+    {
+      return null;
+    }
+
     return createChangeSet(changeSetData);
   }