Index: vhConsistency/ConsistencyCheck.cls.xml
===================================================================
diff -u -r2337 -r2961
--- vhConsistency/ConsistencyCheck.cls.xml	(.../ConsistencyCheck.cls.xml)	(revision 2337)
+++ vhConsistency/ConsistencyCheck.cls.xml	(.../ConsistencyCheck.cls.xml)	(revision 2961)
@@ -37,11 +37,11 @@
 		Do ..Meldingen.WriteLine("Consistency Checks :")
 		Do ..Meldingen.WriteLine("--------------------")
 		Do ..Meldingen.WriteLine()
-		Set CheckGefaald = 0
 		
 		set rs = ##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
 		do rs.Execute("vhConsistency.Check")
 		while rs.Next() {
+			Set CheckGefaald = 0
 			set ClassName = rs.Data("Name")
 			If (CheckName = "") || $$$StartsWithVar(ClassName,CheckName) {
 				Set $ZTRAP = "ErrHandling"
@@ -50,33 +50,39 @@
 				}
 				Set $ZTRAP = ""
 			}
-			Continue
+			Goto Finally
 ErrHandling Set CheckGefaald = 1 Do ..Meldingen.Write(ClassName_" : GEFAALD "_$C(13,10,9)_##class(TECH.ExceptionHandler).Catch().ToString()_$C(13,10))
-		}		
-		
-		If (CheckGefaald || ToonAlles)
+Finally
+			Do ..CheckAfgerond(ClassName, CheckGefaald, ToonAlles, StuurMail)
+		}
+]]></Implementation>
+</Method>
+
+<Method name="CheckAfgerond">
+<FormalSpec>CheckClassName:%String,CheckGefaald:%Boolean,ToonAlles:%Boolean,StuurMail:%Boolean</FormalSpec>
+<Implementation><![CDATA[
+	
+	If ToonAlles {
+		Do ..Meldingen.Rewind()	
+		While ('..Meldingen.AtEnd)
 		{
-			If ToonAlles {
-				Do ..Meldingen.Rewind()	
-				Write ..Meldingen.Read(..Meldingen.Size)
+			Write ..Meldingen.Read(..Meldingen.Size)
+		}
+	}
+	If (CheckGefaald && StuurMail) {
+		Set From = $$$SystemMail($$$Server_" - Consistency check")
+		Set MailNaar = ""
+		Set Mail = $$GetMailAddressFromTerminal^vhLib()
+		Set:(Mail'="") MailNaar = $LB(Mail)
+		If (MailNaar = ""){
+			Set Mails = $zobjclassmethod(CheckClassName,"%GetParameter","StuurMailNaar")
+			Set:(Mails="") Mails = ##class(TECH.Config.ConfigMgr).Instance().GetString("vhConsistencyCheck.MailNaar")
+			For i = 0 : 1 : $Length(Mails,";") {
+				Set MailNaar = MailNaar_$ListBuild($Piece(Mails,";",i))
 			}
-			If (CheckGefaald && StuurMail) {
-				Set From = $$$SystemMail($$$Server_" - Consistency check")
-				Set MailNaar = ""
-				Set Mail = $$GetMailAddressFromTerminal^vhLib()
-				Set:(Mail'="") MailNaar = $LB($$GetMailAddressFromTerminal^vhLib())
-				If (MailNaar = ""){
-					Set Mails = ##class(TECH.Config.ConfigMgr).Instance().GetString("vhConsistencyCheck.MailNaar")
-					For i = 0 : 1 : $Length(Mails,";") {
-						Set MailNaar = MailNaar_$ListBuild($Piece(Mails,";",i))
-					}
-				}
-		    	Do SendMiniMailForced^vhLib.Mail(From,MailNaar,"Consistency check failed on ["_$$$Server_"]",..Meldingen,1) 
-			}
 		}
-		Set Resultaat = "OK"
-		Set:CheckGefaald Resultaat="GEFAALD"
-		Do ##class(vhLib.Logger).%New("vhConsistency").Info("ConsistencyCheck",Resultaat)
+    	Do SendMiniMailForced^vhLib.Mail(From,MailNaar,"Consistencycheck "_$Piece(CheckClassName,".",$Length(CheckClassName,"."))_" failed on ["_$$$Server_"]",..Meldingen,1) 
+	}
 ]]></Implementation>
 </Method>