1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java
index 3e09004f3e..4776a1bc56 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/internal/server/ResourceManager.java
@@ -51,7 +51,10 @@ public class ResourceManager extends Lifecycle implements IResourceManager
     if (id == null)
     {
       id = loadID(path);
-      registerResource(id, path);
+      if (id != null)
+      {
+        registerResource(id, path);
+      }
     }
 
     return id;
@@ -63,7 +66,10 @@ public class ResourceManager extends Lifecycle implements IResourceManager
     if (path == null)
     {
       path = loadPath(id);
-      registerResource(id, path);
+      if (path != null)
+      {
+        registerResource(id, path);
+      }
     }
 
     return path;