diff --git a/su4sml/src/wfcpog/constructor_consistency.sml b/su4sml/src/wfcpog/constructor_consistency.sml
index d915c5a..716db20 100644
--- a/su4sml/src/wfcpog/constructor_consistency.sml
+++ b/su4sml/src/wfcpog/constructor_consistency.sml
@@ -150,11 +150,11 @@ fun override_old_creators wfpo (model as (clist, alist)) =
 	val _ = trace function_calls ("WFCPOG_Constructor_Consistency.overrides_old_creators\n")
 	val cl = removeOclLibrary clist
 	val classes = List.filter (fn a => (is_Class a) orelse (is_AssoClass a)) cl
-	val res = List.all (fn a => a = true) (List.map (fn a => check_override_classifier a model) classes)
+	val res = List.all (fn a => a = true) (List.map (fn a => check_override_classifier a model
+							    handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)) classes)
 	val _ = trace function_calls ("WFCPOG_Constructor_Consistency.overrides_old_creators\n")
     in
 	res
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)
     end
 
 fun post_implies_invariant wfpo (model as (clist, alist)) =
diff --git a/su4sml/src/wfcpog/interface_consistency.sml b/su4sml/src/wfcpog/interface_consistency.sml
index ea68bdc..39694ba 100644
--- a/su4sml/src/wfcpog/interface_consistency.sml
+++ b/su4sml/src/wfcpog/interface_consistency.sml
@@ -171,11 +171,11 @@ fun check_stereotypes wfpo (model as (clist,alist)) =
 	val _ = trace function_calls ("WFCPOG_Interface_Consistency.check_stereotypes\n")
 	val cl = removeOclLibrary clist
 	val classes = List.filter (fn a => (is_Iface a)) cl
-	val res = List.all (fn a => a = true) (List.map (fn a => check_stereotypes_interface a model) classes)
+	val res = List.all (fn a => a = true) (List.map (fn a => check_stereotypes_interface a model
+							    handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)) classes)
 	val _ = trace function_ends ("WFCPOG_Interface_Consistency.check_stereotypes\n")
     in
 	res
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)
     end
 
 fun check_nameclashes wfpo (model as (clist,alist)) = 
@@ -183,10 +183,11 @@ fun check_nameclashes wfpo (model as (clist,alist)) =
 	val _ = trace function_calls ("WFCPOG_Interface_Consistency.check_nameclashes\n")
 	val cl = removeOclLibrary clist
 	val classes = List.filter (fn a => (is_Class a) orelse (is_AssoClass a) orelse (is_Primi a) orelse (is_Enum a)) cl
-	val res = List.all (fn a => a = true) (List.map (fn a => check_nameclash_classifier a model) classes)
+	val res = List.all (fn a => a = true) (List.map (fn a => check_nameclash_classifier a model
+							    handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)) classes)
 	val _ = trace function_ends ("WFCPOG_Interface_Consistency.check_nameclashes\n")
     in
 	res
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)
+
     end
 end;
diff --git a/su4sml/src/wfcpog/refine_constraint.sml b/su4sml/src/wfcpog/refine_constraint.sml
index 97931b4..9bbc7b7 100644
--- a/su4sml/src/wfcpog/refine_constraint.sml
+++ b/su4sml/src/wfcpog/refine_constraint.sml
@@ -286,6 +286,7 @@ fun check_syntax wfpo (model:Rep.Model as (clist,alist)) =
 	val model_packages = all_packages_of_model model
 	val check = if ((member from model_packages) andalso (member to model_packages))
 		    then check_syntax_help model from to
+			 handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)
 		    else
 			let
 			    val s1 = ("\n\n########################################################\n")
@@ -298,7 +299,6 @@ fun check_syntax wfpo (model:Rep.Model as (clist,alist)) =
 	val _ = trace function_ends ("WFCPOG_Refine_Constraint.check_syntax\n")
     in
 	check
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfpo,s)
     end
 
 fun get_holocl_operation var_name oper class model = 
diff --git a/su4sml/src/wfcpog/visibility_consistency.sml b/su4sml/src/wfcpog/visibility_consistency.sml
index 0d361f8..cf92e01 100644
--- a/su4sml/src/wfcpog/visibility_consistency.sml
+++ b/su4sml/src/wfcpog/visibility_consistency.sml
@@ -340,11 +340,11 @@ fun model_entity_consistency wfc_sel (model as (clist,alist)) =
 	val cl = removeOclLibrary (clist)
         (* visiblity only for Classes and AssocClasses *)
 	val classes = List.filter (fn a => (is_Class a) orelse (is_AssoClass a)) cl
-	val res = List.all (fn a => a = true) (List.map (fn a => check_entity_classifier a model) classes)
+	val res = List.all (fn a => a = true) (List.map (fn a => check_entity_classifier a model
+							    handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)) classes)
 	val _ = trace function_ends ("WFCPOG_Visibility_Constraint.model_entity_consistency\n")
     in
 	res
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)
     end
 
 fun model_inheritance_consistency wfc_sel (model as (clist,alist)) = 
@@ -352,11 +352,12 @@ fun model_inheritance_consistency wfc_sel (model as (clist,alist)) =
 	val _ = trace function_calls ("WFCPOG_Visibility_Constraint.model_inheritance_consistency\n")
 	val cl = removeOclLibrary (clist)
 	val classes = List.filter (fn a => (is_Class a) orelse (is_AssoClass a)) cl
-	val res  = List.all (fn a => a = true) (List.map (fn a => check_inheritance_classifier a model) classes)
+	val res  = List.all (fn a => a = true) (List.map (fn a => check_inheritance_classifier a model
+							     handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)) classes)
 	val _ = trace function_ends ("WFCPOG_Visibility_Constraint.model_inheritance_consistency\n")
     in
 	res
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)
+
     end
 
 fun constraint_check_by_runtime_consistency wfc_sel (model as (clist,alist)) = 
@@ -364,11 +365,11 @@ fun constraint_check_by_runtime_consistency wfc_sel (model as (clist,alist)) =
 	val _ = trace function_calls ("WFCPOG_Visibility_Constraint.constraint_check_by_runtime_consistency\n")
 	val cl = removeOclLibrary clist
 	val classes = List.filter (fn a => (is_Class a) orelse (is_AssoClass a)) cl
-	val res = List.all (fn a => a = true) (List.map (fn a => check_runtime_classifier a model) classes)
+	val res = List.all (fn a => a = true) (List.map (fn a => check_runtime_classifier a model
+							    handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)) classes)
 	val _ = trace function_ends ("WFCPOG_Visibility_Constraint.constraint_check_by_runtime_consistency\n")
     in
 	res
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)
     end
 
 fun constraint_design_by_contract_consistency wfc_sel (model as (clist,alist)) = 
@@ -376,10 +377,11 @@ fun constraint_design_by_contract_consistency wfc_sel (model as (clist,alist)) =
 	val _ = trace function_calls ("WFCPOG_Visibility_Constraint.constraint_design_by_contract_consistency\n")
 	val cl = removeOclLibrary clist
 	val classes = List.filter (fn a => (is_Class a) orelse (is_AssoClass a)) cl
-	val res = List.all (fn a => a = true) (List.map (fn a => check_design_classifier a model) classes)
+	val res = List.all (fn a => a = true) (List.map (fn a => check_design_classifier a model
+							    handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)) classes)
  	val _ = trace function_calls ("WFCPOG_Visibility_Constraint.constraint_design_by_contract_consistency\n")
     in
 	res
-	handle WFCPOG.WFC_FailedMessage s => raise WFCPOG.WFC_FailedException (wfc_sel,s)
+	
     end
 end;