Index: WSimpl/Vhisie4/HeaderValidator.cls.xml
===================================================================
diff -u -r70269 -r70322
--- WSimpl/Vhisie4/HeaderValidator.cls.xml	(.../HeaderValidator.cls.xml)	(revision 70269)
+++ WSimpl/Vhisie4/HeaderValidator.cls.xml	(.../HeaderValidator.cls.xml)	(revision 70322)
@@ -46,13 +46,13 @@
 <Private>1</Private>
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality = ..PersonalityRepository.GeefViaID(Header.PersonalityId)
-	#dim KlantId As %String = ..PersonalityService.GeefKlantIdViaKlantCode(Personality, Header.KlantId)
+	#dim KlantId As %String = ..PersonalityService.GeefKlantIdViaKlantCode(Personality, $$$If(Header.PersonalityId=##class(DOM.common.enu.Personality).VanHoecke(),+Header.KlantId,Header.KlantId))
 	
 	If $$$Not(..KlantValidator.IsGeldig(KlantId, Personality)) {
-		If (Personality = ##class(DOM.common.enu.Personality).VanHoecke() || ##class(DOM.common.enu.Personality).VanHoeckeVoorHalux()) {
-			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '"_Header.KlantId_"' bestaat niet")
+		If ((Header.PersonalityId = ##class(DOM.common.enu.Personality).VanHoecke()) || (Header.PersonalityId = ##class(DOM.common.enu.Personality).VanHoeckeVoorHalux())) {
+			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '" _ KlantId _ "' bestaat niet")
 		} Else {
-			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '"_Header.KlantId_"' bestaat niet als eindklant van personality '" _ Personality.GeefCode() _ "' (" _ Header.PersonalityId_").")
+			Do ##class(TECH.Exceptions.InvalidInputException).Throw("Klant met id '" _ KlantId _ "' bestaat niet als eindklant van personality '" _ Personality.GeefCode() _ "' (" _ Header.PersonalityId_").")
 		}
 	}
 ]]></Implementation>