Index: DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r53954 -r54119
--- DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 53954)
+++ DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 54119)
@@ -145,7 +145,8 @@
 <Implementation><![CDATA[
 	#dim Key As %String
 	try {
-		Set Key = ^KKL(^KK1($E(KlantId,4,99)),"L"_##class(TECH.StringUtils).AlignRight(KlantAdresNr," ",3))
+		#dim KlantNummer As %Integer = ..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantId)
+		Set Key = ^KKL(^KK1(KlantNummer),"L"_##class(TECH.StringUtils).AlignRight(KlantAdresNr," ",3))
 	} catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen leveradres voor combinatie KlantId '"_KlantId_"' en AdresVolgnummer '"_KlantAdresNr_"'"))
@@ -175,7 +176,9 @@
 <Method name="BestaatViaKlantIdEnKlantAdresNr">
 <FormalSpec>KlantId:%String,KlantAdresNr:%String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
-<Implementation><![CDATA[	Quit $Data(^KKL(^KK1($E(KlantId,4,99)),"L"_##class(TECH.StringUtils).AlignRight(KlantAdresNr," ",3)))
+<Implementation><![CDATA[
+	#dim KlantNummer As %Integer = ..LegacyPartijApi.GeefKlantNummerVoorPartijID(KlantId)
+	Quit $Data(^KKL(^KK1(KlantNummer),"L"_##class(TECH.StringUtils).AlignRight(KlantAdresNr," ",3)))
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/DOM/VKP/impl/LeverAdresRepository/Bewaar.cls.xml
===================================================================
diff -u -r49999 -r54119
--- vhUnitTest/DOM/VKP/impl/LeverAdresRepository/Bewaar.cls.xml	(.../Bewaar.cls.xml)	(revision 49999)
+++ vhUnitTest/DOM/VKP/impl/LeverAdresRepository/Bewaar.cls.xml	(.../Bewaar.cls.xml)	(revision 54119)
@@ -67,6 +67,7 @@
 	#dim PartijId As %String = "K||"_..#TestKlantnummer
 	
 	Do ..LegacyPartijApi.IndienMethodCall("GeefKlantPartijID",..#TestKlantnummer).DanReturn(PartijId)
+	Do ..LegacyPartijApi.IndienMethodCall("GeefKlantNummerVoorPartijID", PartijId).DanReturn(..#TestKlantnummer)
 	Do ..PartijApi.IndienMethodCall("GeefPartij",PartijId).DanReturn(Partij)
 	
 	Set LeveradresRepository = ##class(DOM.VKP.impl.LeverAdresRepository).%New(,..LegacyPartijApi, ..PartijApi)