Index: vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r51263 -r53222
--- vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 51263)
+++ vhTest/Mock/DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 53222)
@@ -9,9 +9,9 @@
 <Inheritance>right</Inheritance>
 
 <Method name="GeefEindPersonality">
-<FormalSpec>OorsprongKettingString:%String</FormalSpec>
+<FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
 <ReturnType>DOM.common.Personality</ReturnType>
-<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEindPersonality",OorsprongKettingString)
+<Implementation><![CDATA[	quit ..VerwerkMethodCall("GeefEindPersonality",OorsprongKettingString,FallBackKlantId)
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml
===================================================================
diff -u -r51277 -r53222
--- vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 51277)
+++ vhUnitTest/DOM/VKP/impl/EindPersonalityBepaler/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 53222)
@@ -33,14 +33,22 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Helemaal lege ketting">
+<Method name="Test: Helemaal lege ketting, zonder FallBackKlantId">
 <Implementation><![CDATA[
 	#dim Ketting As %String = ""
 	
 	Do $$$AssertEquals(..VoerUit(Ketting).GeefID(), ##class(DOM.common.enu.Personality).VanHoecke())
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Helemaal lege ketting, met HafeleNL als FallBackKlantId">
+<Implementation><![CDATA[
+	#dim Ketting As %String = ""
+	
+	Do $$$AssertEquals(..VoerUit(Ketting, ##class(DOM.VKP.enu.Klant).HaefeleNederland()).GeefID(), ##class(DOM.common.enu.Personality).HaefeleNL())
+]]></Implementation>
+</Method>
+
 <Method name="Test: Ketting met 1 items (bv Van Hoecke)">
 <Implementation><![CDATA[
 	#dim Ketting As %String = "((1, ""K||7833"", 255025))"
@@ -66,11 +74,11 @@
 </Method>
 
 <Method name="VoerUit">
-<FormalSpec>Ketting:%String</FormalSpec>
+<FormalSpec>Ketting:%String,FallBackKlantId:%String=""</FormalSpec>
 <ReturnType>DOM.common.Personality</ReturnType>
 <Implementation><![CDATA[
 	Set EindPersonalityBepaler = ##class(DOM.VKP.impl.EindPersonalityBepaler).%New()
-	Quit EindPersonalityBepaler.GeefEindPersonality(Ketting)
+	Quit EindPersonalityBepaler.GeefEindPersonality(Ketting, FallBackKlantId)
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/VKP/impl/EindPersonalityBepaler.cls.xml
===================================================================
diff -u -r51275 -r53222
--- DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 51275)
+++ DOM/VKP/impl/EindPersonalityBepaler.cls.xml	(.../EindPersonalityBepaler.cls.xml)	(revision 53222)
@@ -21,26 +21,35 @@
 </Method>
 
 <Method name="GeefEindPersonality">
-<FormalSpec>OorsprongKettingString:%String</FormalSpec>
+<FormalSpec>OorsprongKettingString:%String,FallBackKlantId:%String=""</FormalSpec>
 <ReturnType>DOM.common.Personality</ReturnType>
 <Implementation><![CDATA[
-	Quit:OorsprongKettingString="" ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
-	
-	Try {	
-		Set OorsprongKettingString = $Replace(OorsprongKettingString,"((","")
-		Set OorsprongKettingString = $Replace(OorsprongKettingString,"))","")
-		
-		#dim OorsprongKetting As %List = ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (")
-		
-		#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting,1),",",1)
-		If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
-			Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+	#dim Personality As DOM.common.Personality
+	If (OorsprongKettingString = "") {
+		If FallBackKlantId = "" {
+			Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
+		} Else {
+			If (FallBackKlantId = ##class(DOM.VKP.enu.Klant).HaefeleNederland()) {
+				Set Personality = ..PersonalityRepository.GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
+			}
 		}
-		#dim Personality As DOM.common.Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
-	} Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'")
-		Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
+	} Else {
+		Try {	
+			Set OorsprongKettingString = $Replace(OorsprongKettingString,"((","")
+			Set OorsprongKettingString = $Replace(OorsprongKettingString,"))","")
+			
+			#dim OorsprongKetting As %List = ##class(TECH.ListUtils).PiecesToListbuild(OorsprongKettingString, "), (")
+			
+			#dim PersonalityID As %Integer = $Piece($List(OorsprongKetting,1),",",1)
+			If ##class(TECH.StringUtils).Equals(PersonalityID,"","()") {
+				Set PersonalityID = ##class(DOM.common.enu.Personality).VanHoecke()
+			}
+			Set Personality = ..PersonalityRepository.GeefViaID(PersonalityID)
+		} Catch {
+			#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+			Do ##class(vhLib.Logger).%New().Warning("EindPersonalityBepaler","Er was een probleem met het verwerken van oorsprongketting '"_OorsprongKettingString_"'")
+			Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
+		}
 	}
 	
 	Quit Personality