diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java
index 0ff0b0020671915e71c7f8cada218e7fb9e6dc49..445bd7b61f0d65fecb2f2f63ef827834781f4e18 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/internal/ConstraintService.java
@@ -77,8 +77,12 @@ public class ConstraintService extends
 	 */
 	private void performConstraintCheck(EObject modelElement,
 			List<IConstraintViolation<EObject>> violationList) {
-		for (IConstraintChecker<EObject> checker : getRegisteredHandlers(modelElement
-				.getClass())) {
+		List<IConstraintChecker<EObject>> handlers = getRegisteredHandlers(modelElement
+				.getClass());
+		if (handlers == null) {
+			return;
+		}
+		for (IConstraintChecker<EObject> checker : handlers) {
 			if (checker.isApplicable(modelElement)) {
 				IConstraintViolation<EObject> violation = checker
 						.apply(modelElement);
diff --git a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IConstraintService.java b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IConstraintService.java
index 386962513ad9e10cc0a2bc12358702d88e249341..ecfe03cd69e024fa82c28a1938967f586d25340f 100644
--- a/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IConstraintService.java
+++ b/org.fortiss.tooling.kernel/trunk/src/org/fortiss/tooling/kernel/services/IConstraintService.java
@@ -43,8 +43,8 @@ public interface IConstraintService {
 	 * its content and returns the check results. Note, that this method can be
 	 * time-consuming for large model element trees.
 	 */
-	<T extends EObject> List<IConstraintViolation<T>> performAllConstraintChecksRecursively(
-			T modelElement);
+	List<IConstraintViolation<EObject>> performAllConstraintChecksRecursively(
+			EObject modelElement);
 
 	/**
 	 * Performs all constraint checks only on the given model element and