diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
index 4a289bc64c657bb11ce85293fdf2c04fe00407d7..351b8c294f8d48d27f222a3288b571f14fc43c5d 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/storage/eclipse/ModelContext.java
@@ -152,6 +152,10 @@ class ModelContext implements ITopLevelElement {
 	/** {@inheritDoc} */
 	@Override
 	public void prepareIDs(EObject other) {
+		if (other == null) {
+			return;
+		}
+
 		boolean needSmart = false;
 		if (other instanceof IIdLabeled) {
 			if (((IIdLabeled) other).getId() <= 0) {