Index: vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/GeefEindPersonality/Test.cls.xml
===================================================================
diff -u -r51398 -r53190
--- vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 51398)
+++ vhUnitTest/DOM/VKP/impl/DataM/DataMBonAbstract/GeefEindPersonality/Test.cls.xml	(.../Test.cls.xml)	(revision 53190)
@@ -33,9 +33,53 @@
 	Do EindPersonalityBepalerMock.Verifieer()
 	K ^KUL(..#KlantNummer,"F",..#Uitlevering,1)
 	K ^KU1(..#Uitlevering,"F")
+	
+	Do $$$AssertEquals(EindPersonality.GeefID(),##class(DOM.common.enu.Personality).VanHoecke())
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Geen OorsprongKetting aanwezig -&gt; EindPersonality is VanHoecke">
+<Implementation><![CDATA[
+	Set EindPersonalityBepalerMock = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
+	Do EindPersonalityBepalerMock.VerwachtMethodCall("GeefEindPersonality",$$$ElkeWaarde).ExactAantalKeer(0)
+	
+	Set ^KU1(..#Uitlevering,"F") = ..#KlantNummer_"\"_..#FactuurNummer_"\P\"	
+	Set $P(^KUL(..#KlantNummer,"F",..#Uitlevering,1),"\",59) = ""
+	
+	Set DataMBonAbstract = ##class(DOM.VKP.impl.DataM.DataMBon).%New(..#Uitlevering)
+	Do DataMBonAbstract.ZetEindPersonalityBepaler(EindPersonalityBepalerMock)
+	#dim EindPersonality As DOM.common.Personality = DataMBonAbstract.GeefEindPersonality()
+	
+	Do EindPersonalityBepalerMock.Verifieer()
+	K ^KUL(..#KlantNummer,"F",..#Uitlevering,1)
+	K ^KU1(..#Uitlevering,"F")
+	
+	Do $$$AssertEquals(EindPersonality.GeefID(),##class(DOM.common.enu.Personality).VanHoecke())
+]]></Implementation>
+</Method>
+
+<Method name="Test: Geen OorsprongKetting aanwezig, maar klant is HFLNL: HFLNL als EindPersonality nemen">
+<Implementation><![CDATA[
+	Set EindPersonalityBepalerMock = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
+	Do EindPersonalityBepalerMock.VerwachtMethodCall("GeefEindPersonality",$$$ElkeWaarde).ExactAantalKeer(0)
+	
+	#dim KlantNummer As %String = 2671
+	
+	Set ^KU1(..#Uitlevering,"F") = KlantNummer_"\"_..#FactuurNummer_"\P\"	
+	Set $P(^KUL(KlantNummer,"F",..#Uitlevering,1),"\",59) = ""
+	
+	Set DataMBonAbstract = ##class(DOM.VKP.impl.DataM.DataMBon).%New(..#Uitlevering)
+	Do DataMBonAbstract.ZetEindPersonalityBepaler(EindPersonalityBepalerMock)
+	#dim EindPersonality As DOM.common.Personality = DataMBonAbstract.GeefEindPersonality()
+	
+	Do EindPersonalityBepalerMock.Verifieer()
+	K ^KUL(KlantNummer,"F",..#Uitlevering,1)
+	K ^KU1(..#Uitlevering,"F")
+	
+	Do $$$AssertEquals(EindPersonality.GeefID(),##class(DOM.common.enu.Personality).HaefeleNL())
+]]></Implementation>
+</Method>
+
 <Method name="Test: exceptie geraised in EindPersonalityBepaler -&gt; default">
 <Implementation><![CDATA[
 	Set EindPersonalityBepalerStub = ##class(vhTest.Mock.DOM.VKP.impl.EindPersonalityBepaler).%New()
@@ -50,6 +94,8 @@
 	
 	K ^KUL(..#KlantNummer,"F",..#Uitlevering,1)
 	K ^KU1(..#Uitlevering,"F")
+	
+	Do $$$AssertEquals(EindPersonality.GeefID(),##class(DOM.common.enu.Personality).VanHoecke())
 ]]></Implementation>
 </Method>
 </Class>
Index: DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r51294 -r53190
--- DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 51294)
+++ DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 53190)
@@ -397,7 +397,15 @@
 <Implementation><![CDATA[
 	#dim Personality As DOM.common.Personality
 	Try {
-		Set Personality = ..EindPersonalityBepaler.GeefEindPersonality($Piece(..NodeHoofding,"\",59))
+		If $$$HasLength($Piece(..NodeHoofding,"\",59)) {
+			Set Personality = ..EindPersonalityBepaler.GeefEindPersonality($Piece(..NodeHoofding,"\",59))
+		} Else {
+			If ..GeefKlantID() = ##class(DOM.VKP.enu.Klant).HaefeleNederland() {
+				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).HaefeleNL())
+			} Else {
+				Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())
+			}
+		}
 	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set Personality = ##class(DOM.common.impl.PersonalityRepository).%New().GeefViaID(##class(DOM.common.enu.Personality).VanHoecke())