diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
index 770e6e9c10150d1b56872d752f487906d98216ec..c1829b70e87cc8ec45ec32276c3ebc67c35cde86 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ElementCompositorService.java
@@ -100,6 +100,9 @@ public final class ElementCompositorService extends
 	private IElementCompositor<EObject> findWorkingCompositor(
 			EObject container, EObject contained,
 			IElementCompositionContext context, boolean decompose) {
+		if (container == null) {
+			return null;
+		}
 		List<IElementCompositor<EObject>> list = getRegisteredHandlers(container
 				.getClass());
 		if (list == null) {