Index: vhConsistency/ConsistencyCheck.cls.xml
===================================================================
diff -u -r1307 -r1314
--- vhConsistency/ConsistencyCheck.cls.xml	(.../ConsistencyCheck.cls.xml)	(revision 1307)
+++ vhConsistency/ConsistencyCheck.cls.xml	(.../ConsistencyCheck.cls.xml)	(revision 1314)
@@ -10,30 +10,26 @@
 <ClassDefinitionError>0</ClassDefinitionError>
 
 <Property name="Meldingen">
-<Type>%String</Type>
+<Type>%GlobalCharacterStream</Type>
 </Property>
 
-<Property name="J">
-<Type>%String</Type>
-</Property>
-
 <Method name="VoerUit">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>ToonAlles:%Boolean=0,StuurMail:%Boolean=1</FormalSpec>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	Set J = $$%J^vhRtn1()
-	Set ^HULP(J)=""
 	Set ConsistencyCheck = ..%New()
-	Set ConsistencyCheck.J = J
 	Do ConsistencyCheck.VoerAlleChecksUit(ToonAlles,StuurMail)
-	Kill ^HULP(J)
 ]]></Implementation>
 </Method>
 
 <Method name="VoerAlleChecksUit">
 <FormalSpec>ToonAlles:%Boolean=0,StuurMail:%Boolean</FormalSpec>
 <Implementation><![CDATA[
+		
+		Do ..Meldingen.WriteLine("Consistency Checks :")
+		Do ..Meldingen.WriteLine("--------------------")
+		Do ..Meldingen.WriteLine()
 		Set CheckGefaald = 0
 		
 		set rs = ##class(%ResultSet).%New("%Dictionary.ClassDefinitionQuery:SubclassOf")
@@ -46,14 +42,15 @@
 			}
 			Set $ZTRAP = ""
 			Continue
-ErrHandling Set CheckGefaald = 1 Set ^HULP(..J) = ^HULP(..J) _ Classname_" : GEFAALD "_$C(13,10,9)_$ZE_$C(13,10)
-		}
+ErrHandling Set CheckGefaald = 1 Do ..Meldingen.Write(Classname_" : GEFAALD "_$C(13,10,9)_$ZE_$C(13,10))
+		}		
 		
-		Set Hoofding = "Consistency Checks : "_$C(13,10)_"--------------------"_$C(13,10)_$C(13,10)
-		Set Boodschap = Hoofding_^HULP(..J)
 		If (CheckGefaald || ToonAlles)
 		{
-			If ToonAlles w Boodschap,!	
+			If ToonAlles {
+				Do ..Meldingen.Rewind()	
+				Write ..Meldingen.Read(..Meldingen.Size)
+			}
 			If (CheckGefaald && StuurMail) {
 				Set From = $$$SystemMail($$$Server_" - Consistency check")
 				Set MailNaar = ""
@@ -65,12 +62,12 @@
 						Set MailNaar = MailNaar_$ListBuild($Piece(Mails,";",i))
 					}
 				}
-		    	Do SendMiniMail^vhLib(From,MailNaar,"Consistency check failed on ["_$$$Server_"]",Boodschap,0) 
+		    	Do SendMiniMail^vhLib(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_$C(13,10)_Boodschap)
+		Do ##class(vhLib.Logger).%New("vhConsistency").Info("ConsistencyCheck",Resultaat)
 ]]></Implementation>
 </Method>
 
@@ -85,12 +82,12 @@
 		
 		If ('Check.SkipCheck){
 			If (Resultaat '= $$$OK){
-				Set ^HULP(..J) = ^HULP(..J)_Check.GeefMelding()
+				Do ..Meldingen.Write(Check.GeefMelding())
 			}ElseIf(ToonAlles && Resultaat){
-				Set ^HULP(..J) = ^HULP(..J)_Classname_" : OK"_$C(13,10)	
+				Do ..Meldingen.WriteLine(Classname_" : OK")
 			}
 		}Else{
-			Set ^HULP(..J) = ^HULP(..J)_Classname_" : SKIPPED"_$C(13,10)
+			Do ..Meldingen.WriteLine(Classname_" : SKIPPED")
 		}
 		Quit Resultaat
 ]]></Implementation>
Index: vhConsistency/Check.cls.xml
===================================================================
diff -u -r1264 -r1314
--- vhConsistency/Check.cls.xml	(.../Check.cls.xml)	(revision 1264)
+++ vhConsistency/Check.cls.xml	(.../Check.cls.xml)	(revision 1314)
@@ -13,8 +13,9 @@
 <InitialExpression>0</InitialExpression>
 </Property>
 
-<Property name="Melding">
-<Type>%String</Type>
+<Property name="MeldingNr">
+<Type>%Integer</Type>
+<InitialExpression>0</InitialExpression>
 </Property>
 
 <Method name="VoerUit">
@@ -25,14 +26,28 @@
 </Method>
 
 <Method name="GeefMelding">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ##this.%ClassName(1)_" : GEFAALD"_$C(10,13)_..Melding
+<ReturnType>%GlobalCharacterStream</ReturnType>
+<Implementation><![CDATA[
+	Set Stream = ##class(%GlobalCharacterStream).%New()
+	
+	Do Stream.Write(##this.%ClassName(1)_" : GEFAALD"_$C(10,13))
+	If ($Data(..MeldingNr)){
+		For i = 0 : 1 : (..MeldingNr-1) {
+			If ($Data(^HULP($Job,"Melding",i))){
+				Do Stream.Write($C(9)_^HULP($Job,"Melding",i))
+			}
+		}
+	}
+	Quit Stream
 ]]></Implementation>
 </Method>
 
 <Method name="VoegMeldingToe">
 <FormalSpec>Melding:%String</FormalSpec>
-<Implementation><![CDATA[	Set ..Melding = ..Melding_$C(9)_Melding_$C(10,13)
+<Implementation><![CDATA[
+	If ('$Data(..MeldingNr)) Set ..MeldingNr = 0 w "..MeldingNr : "_..MeldingNr,!
+	Set ^HULP($Job,"Melding",..MeldingNr) = Melding_$C(10,13)
+	Set ..MeldingNr = ..MeldingNr + 1
 ]]></Implementation>
 </Method>
 </Class>
Index: vhConsistency/Checks/Email.cls.xml
===================================================================
diff -u -r1298 -r1314
--- vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1298)
+++ vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1314)
@@ -29,7 +29,6 @@
 		Set:'..CheckDerdeECToegang() Status = $$$ERROR($$$GeneralError,"Check Derde EC Toegang email gefaald")
 		Set:'..CheckResInternePersoon() Status = $$$ERROR($$$GeneralError,"Check Res InternePersoon email gefaald")
 		Set:'..CheckDerdeAgendaEindgebruiker() Status = $$$ERROR($$$GeneralError,"Check Derde Agenda Eindgebruiker email gefaald")
-		Kill %NsLookUps	
 	}
 	Quit Status
 ]]></Implementation>
@@ -102,6 +101,8 @@
 	While (rset.Next(.sc)){
 		Set Email = $ZSTRIP(rset.Data("Email"),"<>W")		
 		Set Teller = Teller + 1
+		if ($Piece(Teller/100,".",2)="") W Teller,!
+		;w Email,!
 		Set ValidMail = ##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp)
 		If ('ValidMail){
 			Set Feedback = $P($$ParseStatus^vhLib(ValidMail),":",2)
@@ -125,9 +126,12 @@
 <Implementation><![CDATA[
 	Set Status = $$$OK
 	While Iterator.HasNext(){
+		if ($Piece(Teller/100,".",2)="") W Teller,!
 		Set KlantLev = Iterator.Next()
 		Set Mail = KlantLev.GeefEmail()
+		;w KlantLev.GeefNummer(),!
 		If (Mail'= ""){
+			;w "'"_Mail_"'",!
 			Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)
 			If ('ValidMail){
 				Set Mail = $ZSTRIP(Mail,"<>W")
@@ -151,6 +155,8 @@
 		While PersonenIt.HasNext(){
 			Set Persoon = PersonenIt.Next()
 			Set Mail = Persoon.GeefEmail()
+			if ($Piece(Teller/100,".",2)="") W Teller,!
+			;w "'"_Mail_"'",!
 			If (Mail'= "")
 			{
 				Set ValidMail = ##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)