Index: DOM/VKP/impl/DataM/AdresUtils.cls.xml
===================================================================
diff -u -r32427 -r32433
--- DOM/VKP/impl/DataM/AdresUtils.cls.xml	(.../AdresUtils.cls.xml)	(revision 32427)
+++ DOM/VKP/impl/DataM/AdresUtils.cls.xml	(.../AdresUtils.cls.xml)	(revision 32433)
@@ -1,26 +1,40 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="DOM.VKP.impl.DataM.AdresUtils">
-<Super>%RegisteredObject</Super>
+<Super>TECH.RegisteredObject</Super>
 
 <Method name="GeefOrigineelKlantAdresNr">
 <FormalSpec>KlantKey:%String,LeverAdres:DOM.VKP.impl.DataM.DataMAdres</FormalSpec>
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
-	#dim Result As %Integer = LeverAdres.GeefKlantAdresNr()
-	if $D(^KKL(KlantKey)) > 0 {
-		#dim Key As %String = $N(^KKL(KlantKey,"L"))
-		While $P(Key," ",1,1) = "L" {
-			#dim Value As %String = ^KKL(KlantKey,Key)
-			If ($P(Value,"\",2) = LeverAdres.GeefNaam()) {
-				Set Result = $P(Value,"\",1) 
-				}
-			Set Key = $N(^KKL(KlantKey,Key))
-			}
+	#dim Result As %Integer = ""
+	
+	#dim AdresKey As %String = "L"
+	For { Set AdresKey = $Order(^KKL(KlantKey,AdresKey))  Quit:($$$Not($$$StartsWith(AdresKey,"L")))||($$$HasLength(Result))
+	
+		#dim Value As %String = $Get(^KKL(KlantKey,AdresKey))
+		#dim DatabaseLeverAdres As DOM.VKP.impl.DataM.DataMAdres = ##class(DOM.VKP.impl.DataM.DataMAdres).CreateFromDelimitedString(Value)
+		 
+		If ($Piece(..GeefAdresRec(DatabaseLeverAdres),"\",2,9) = $Piece(..GeefAdresRec(LeverAdres),"\",2,9)) {
+			Set Result = $Piece(Value,"\",1)
+			
 		}
+	}
+	If Result = "" {
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("Geen overeenkomstig leveradres gevonden voor "_KlantKey_" "_LeverAdres.ToString())
+	}
 	Quit Result
 ]]></Implementation>
 </Method>
+
+<Method name="GeefAdresRec">
+<FormalSpec>LeverAdres:DOM.VKP.impl.DataM.DataMAdres</FormalSpec>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim D As %String = "\"
+	Quit LeverAdres.GeefKlantAdresNr()_D_LeverAdres.GeefNaam()_D_LeverAdres.GeefToenaam()_D_LeverAdres.GeefAanspreking()_D_LeverAdres.GeefStraat()_D_LeverAdres.GeefPostcode()_D_LeverAdres.GeefGemeente()_D_LeverAdres.GeefLandNr()_D_LeverAdres.GeefTaal()
+]]></Implementation>
+</Method>
 </Class>