Index: APPS/CRM/impl/KlantIDValidator.cls.xml
===================================================================
diff -u -r46658 -r46722
--- APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46658)
+++ APPS/CRM/impl/KlantIDValidator.cls.xml	(.../KlantIDValidator.cls.xml)	(revision 46722)
@@ -43,22 +43,21 @@
 </Method>
 
 <Method name="IsGeldig">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	Set ..KlantID = KlantID
-	Set:$$$Not($IsObject(Personality)) Personality = ##class(DOM.DomeinContext).Instance().GeefCommonAPI().GeefPersonality(##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID())
+	set ..PersonalityID = Personality.GeefID()
 	
 	Quit:$$$Not(..PersonalityService.IsGeldigKlantId(Personality, ..KlantID)) $$$False
 	
-	set ..PersonalityID = Personality.GeefID()
 	Do Personality.Accept($this)
 	Quit ..IsGeldigKlantID
 ]]></Implementation>
 </Method>
 
 <Method name="Valideer">
-<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality=""</FormalSpec>
+<FormalSpec>KlantID:DOM.VKP.VanHoeckeKlantID,Personality:DOM.common.Personality</FormalSpec>
 <Implementation><![CDATA[
 	If '..IsGeldig(KlantID , Personality ) { 
 		do ..ThrowError() 
@@ -70,7 +69,7 @@
 <Private>1</Private>
 <ReturnType>TECH.Exceptions.Exception</ReturnType>
 <Implementation><![CDATA[
-	#dim Foutmelding As %String = "KlantID '"_..KlantID_"' is niet geldig voor "_##class(DOM.common.enu.Personality).LogicalToDisplay(..PersonalityID)
+	#dim Foutmelding As %String = "De klant '"_..KlantID_"' is niet geldig voor personality '"_##class(DOM.common.enu.Personality).LogicalToDisplay(..PersonalityID)_"'."
 	Quit ##class(TECH.Exceptions.InvalidInputException).%New(Foutmelding)
 ]]></Implementation>
 </Method>