Index: DOM/CRM/impl/KlantImpl.cls.xml
===================================================================
diff -u -r1075 -r1292
--- DOM/CRM/impl/KlantImpl.cls.xml	(.../KlantImpl.cls.xml)	(revision 1075)
+++ DOM/CRM/impl/KlantImpl.cls.xml	(.../KlantImpl.cls.xml)	(revision 1292)
@@ -260,7 +260,12 @@
 
 <Method name="ZetEmail">
 <FormalSpec>Email:%String</FormalSpec>
-<Implementation><![CDATA[	Do ..Klant.ZetEmail(Email)
+<Implementation><![CDATA[
+	If ('##class(TECH.Mail).Check(Email,1)){
+		Set Exception = ##class(TECH.Exceptions.BaseException).%New(##class(TECH.enu.ExceptionCode).ParameterInvalid(),"Het email adres "_Email_" is niet geldig.")
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
+	Do ..Klant.ZetEmail(Email)
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/TECH/Mail.cls.xml
===================================================================
diff -u
--- vhUnitTest/TECH/Mail.cls.xml	(revision 0)
+++ vhUnitTest/TECH/Mail.cls.xml	(revision 1292)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="9">
+<Class name="vhUnitTest.TECH.Mail">
+<ProcedureBlock>1</ProcedureBlock>
+<Super>vhUnitTest.TestCase</Super>
+<ClassDefinitionError>0</ClassDefinitionError>
+
+<Method name="TestEmailadressen">
+<Description>
+Do ##class(vhUnitTest.Manager).RunTest("/Display=all","TECH.Mail")</Description>
+<Implementation><![CDATA[
+	Set CacheNsLookUp = 1
+	Set NsLookUp = 1 
+	
+	Set mail = "Joren"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "JorenBlancquaert@"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancquaert@"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren_Blancquaert@ab.a"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren_Blancq%uaert@ab.a"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancquaert@ab.a"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")	
+	Set mail = "Joren.Blancquaert@ab_.a"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = ".Joren.Blancquaert@skynet.be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancquaert.@skynet.be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")	
+	Set mail = "Joren..Blancquaert@skynet.be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")	
+	Set mail = "Joren.Blancquaert@skynet..be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancquaert@skynet.be"
+	Do $$$AssertTrue(##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancq.uaert@skynet.be"
+	Do $$$AssertTrue(##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancq.uae123rt@skynet.be"
+	Do $$$AssertTrue(##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren.Blancq.uae123rt@skynet.be.abc"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren  Blancquaert@skynet.be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+	Set mail = "Joren Blancquaert@skynet.be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")	
+	Set mail = "JorenBlancquaert@sky net.be"
+	Do $$$AssertTrue('##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")	
+	Set mail = "~Joren.Blancquaert@skynet.be"
+	Do $$$AssertTrue(##class(TECH.Mail).Check(mail,NsLookUp,CacheNsLookUp),"Emailadres "_mail_" is goed getest.")
+]]></Implementation>
+</Method>
+</Class>
+</Export>
Index: vhConsistency/Checks/Email.cls.xml
===================================================================
diff -u -r1264 -r1292
--- vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1264)
+++ vhConsistency/Checks/Email.cls.xml	(.../Email.cls.xml)	(revision 1292)
@@ -9,21 +9,27 @@
 
 <Parameter name="DoeNsLookUp">
 <Type>%Boolean</Type>
-<Default>0</Default>
+<Default>1</Default>
 </Parameter>
 
+<Parameter name="CacheNsLookUp">
+<Type>%Boolean</Type>
+<Default>1</Default>
+</Parameter>
+
 <Method name="VoerUit">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	
-	Set ..SkipCheck = 1
+	Set ..SkipCheck = 0
 	Set Status = $$$OK
 	If ('..SkipCheck){
 		Set:'..CheckKlanten() Status = $$$ERROR($$$GeneralError,"Check klanten email gefaald")
 		Set:'..CheckLeveranciers() Status = $$$ERROR($$$GeneralError,"Check leveranciers email gefaald")
 		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>
@@ -96,7 +102,7 @@
 	While (rset.Next(.sc)){
 		Set Email = $ZSTRIP(rset.Data("Email"),"<>W")		
 		Set Teller = Teller + 1
-		If ('##class(TECH.Mail).Check(Email, ..#DoeNsLookUp)){
+		If ('##class(TECH.Mail).Check(Email, ..#DoeNsLookUp,..#CacheNsLookUp)){
 			Set TellerNotValid = TellerNotValid + 1
 			Do ..VoegMeldingToe($C(9)_Email_" niet correct voor : "_rset.Data("Melding"))
 			Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_Email)
@@ -120,9 +126,9 @@
 		Set KlantLev = Iterator.Next()
 		Set Mail = KlantLev.GeefEmail()
 		If (Mail'= ""){
-			If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp)){
+			If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)){
 				Set Mail = $ZSTRIP(Mail,"<>W")
-				If ('##class(TECH.Mail).Check(Mail,..#DoeNsLookUp)){
+				If ('##class(TECH.Mail).Check(Mail,..#DoeNsLookUp,..#CacheNsLookUp)){
 					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"'")
 					Set TellerNotValid = TellerNotValid + 1			
 					Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
@@ -142,7 +148,7 @@
 			Set Mail = Persoon.GeefEmail()
 			If (Mail'= "")
 			{
-				If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp)){
+				If ('##class(TECH.Mail).Check(Mail, ..#DoeNsLookUp,..#CacheNsLookUp)){
 					Do ..VoegMeldingToe($C(9)_KlantLev.GeefNummer()_":"_$C(9)_"'"_$$LCVT^vhLib(Mail)_"' ( Persoon : "_Persoon.GeefNaam()_" "_Persoon.GeefVoornaam()_" )")
 					Set TellerNotValid = TellerNotValid + 1			
 					Set Status = $$$ERROR($$$GeneralError,"Geen correct email"_KlantLev.GeefNummer()_": "_Mail)
Index: TECH/Mail.cls.xml
===================================================================
diff -u -r1264 -r1292
--- TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1264)
+++ TECH/Mail.cls.xml	(.../Mail.cls.xml)	(revision 1292)
@@ -7,60 +7,14 @@
 <Super>%RegisteredObject</Super>
 <ClassDefinitionError>0</ClassDefinitionError>
 
-<Method name="CheckDummy">
-<Description>
-Do ##class(TECH.Mail).CheckDummy()</Description>
-<ClassMethod>1</ClassMethod>
-<Implementation><![CDATA[
-	Set mail = "Joren"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "JorenBlancquaert@"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert@"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren_Blancquaert@ab.a"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren_Blancq%uaert@ab.a"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert@ab.a"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "Joren.Blancquaert@ab_.a"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = ".Joren.Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert.@skynet.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "Joren..Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "Joren.Blancquaert@skynet..be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancq.uaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancq.uae123rt@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren.Blancq.uae123rt@skynet.be.abc"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren  Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-	Set mail = "Joren Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "JorenBlancquaert@sky net.be"
-	w ..Check(mail),$C(9),mail,!	
-	Set mail = "~Joren.Blancquaert@skynet.be"
-	w ..Check(mail),$C(9),mail,!
-]]></Implementation>
-</Method>
-
 <Method name="Check">
 <Description>
 Check een email adres adhv pattern-match, en afzonderlijke controles.
 Tevens kan een nslookup van het domein gedaan worden, aan te geven via parameter.
 Write ##class(TECH.Mail).Check("jbl@vanhoecke.be")
 Write ##class(TECH.Mail).Check("jbl@nietbestaand.be",1)</Description>
 <ClassMethod>1</ClassMethod>
-<FormalSpec>Mail:%String,NsLookUp:%Boolean=0</FormalSpec>
+<FormalSpec>Mail:%String,NsLookUp:%Boolean=0,CacheNsLookUp:%Boolean=0</FormalSpec>
 <Private>1</Private>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
@@ -94,6 +48,9 @@
 	If (NsLookUp){
 		Set:IsValid IsValid = ..NsLookUp(DomainPart)	
 	}
+	If ('CacheNsLookUp){
+		Kill %NsLookUps	
+	}
 	Quit IsValid
 ]]></Implementation>
 </Method>
@@ -114,8 +71,14 @@
 <FormalSpec>MailDomainPart:%String</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
-	Set Status = ..NsLookUpCheck(MailDomainPart)
-	Set:'Status Status = ..NsLookUpCheck("www."_MailDomainPart)
+	/// Als nslookup nog niet gecached is, deze uitvoeren. 
+	Set Status = 0
+	If ($Data(%NsLookUps(MailDomainPart))){
+	  Set Status = %NsLookUps(MailDomainPart)
+	}Else {
+		Set Status = ..NsLookUpCheck(MailDomainPart)
+		Set:'Status Status = ..NsLookUpCheck("www."_MailDomainPart)
+	}
 	Quit Status
 ]]></Implementation>
 </Method>
@@ -134,6 +97,7 @@
 	Set Status = %NsLookUp
 	Do DELFILE^vhDEV("c:\",FileName)
 	Kill %NsLookUp	
+	Set %NsLookUps(MailDomainPart) = Status
 	Quit Status
 ]]></Implementation>
 </Method>