Index: DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48510 -r48517
--- DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48510)
+++ DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48517)
@@ -61,6 +61,19 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatViaAXLeverAdresId">
+<FormalSpec>AXLeverAdresId:%String</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim Query As %String = "SELECT count(ID) from Derde_Klant.LevAdres where AxLeveradresId = ?"
+	#dim Params As %List = $ListBuild(AXLeverAdresId)
+	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetDynamicResultSet(Query, Params)
+	
+	Do ResultSet.Next()
+	Quit ResultSet.GetData(1)
+]]></Implementation>
+</Method>
+
 <Method name="GeefViaAXLeverAdresId">
 <FormalSpec>AXLeverAdresId:%String</FormalSpec>
 <ReturnType>DOM.VKP.impl.LeverAdres</ReturnType>
@@ -69,11 +82,8 @@
 	#dim Params As %List = $ListBuild(AXLeverAdresId)
 	#dim ResultSet As TECH.ResultSet = ..QueryAPI.GetDynamicResultSet(Query, Params)
 	
-	If ResultSet.HasNext() {
-		Quit ..GeefViaID(ResultSet.Next.GetData())
-	} Else {
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Geen leveradres voor AXLeverAdresId '"_AXLeverAdresId_"'"))
-	}
+	Do ResultSet.Next()
+	Quit ..GeefViaKlantIdEnAdresVolgnummer("K||"_$p(ResultSet.GetData(1),"||",1),##class(TECH.StringUtils).StripAllExceptNumeric($p(ResultSet.GetData(1),"||",2)))
 ]]></Implementation>
 </Method>
 </Class>