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>