Index: DOM/VKP/impl/LeverAdresRepository.cls.xml
===================================================================
diff -u -r48581 -r48865
--- DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48581)
+++ DOM/VKP/impl/LeverAdresRepository.cls.xml	(.../LeverAdresRepository.cls.xml)	(revision 48865)
@@ -3,6 +3,35 @@
 <Class name="DOM.VKP.impl.LeverAdresRepository">
 <Super>TECH.Repository,TECH.Mockable</Super>
 
+<Property name="LegacyPartijApi">
+<Type>DOM.PARTIJ.LegacyPartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="PartijApi">
+<Type>DOM.PARTIJ.PartijAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="QueryAPI">
+<Type>TECH.Query.QueryAPI</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>QueryAPI:TECH.Query.QueryAPI,LegacyPartijApi:DOM.PARTIJ.LegacyPartijAPI,PartijApi:DOM.PARTIJ.PartijAPI</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..QueryAPI = $$$Implementation(QueryAPI,##class(TECH.Context).Instance().GeefQueryAPI())
+	Set ..LegacyPartijApi = $$$Inject(LegacyPartijApi,##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI())
+	Set ..PartijApi = $$$Inject(PartijApi,##class(DOM.DomeinContext).Instance().GeefPartijAPI())
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Maak">
 <Implementation><![CDATA[	Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.UnimplementedException).%New("Maak() nog niet geïmplementeerd"))
 ]]></Implementation>
@@ -11,6 +40,10 @@
 <Method name="Bewaar">
 <FormalSpec>Klant:DOM.VKP.VanHoeckeKlant,LeverAdres:DOM.VKP.LeverAdres</FormalSpec>
 <Implementation><![CDATA[
+	If ($$$Not($$$HasLength(LeverAdres.ID))) {
+		Set Exception = ##class(TECH.Exceptions.IllegalArgumentException).%New("LeverAdres '"_LeverAdres.GeefNaam()_" "_LeverAdres.GeefAanspreking()_"' van klant '"_Klant.GeefID()_"' heeft geen ID en kan daarom niet bewaard worden")
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
 	try {
 		#dim KlantIndexKKL As %String = ..GeefKlantIndexKKL($Piece(Klant.GeefID(),"||",2))
 		#dim LeverAdresId As %Integer = LeverAdres.ID
@@ -38,12 +71,12 @@
 		Set ^KKL(KlantIndexKKL,Node) = AdresNode
 		Set $Piece(^KKL(KlantIndexKKL,0),"\",19) = 1
 		
-		#dim PartijId As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID($Piece(Klant.GeefID(),"||",2))
+		#dim PartijId As DOM.common.PartijID = ..LegacyPartijApi.GeefKlantPartijID($Piece(Klant.GeefID(),"||",2))
 		Set ^KKL.AdresI("KlantId_AdresVolgNr",AdresId) = $listbuild(PartijId,LeverAdresId)
 	 	Do ##class(DOM.VKP.VanHoeckeKlant.impl.EventRaiser).%New().RaiseKlantAdresGewijzigdEvent(AdresId)	
 	} catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("LeverAdres '"_LeverAdres.GeefNaam()_" "_LeverAdres.GeefAanspreking()_"' kan niet bewaard worden"))
+		Set Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.IllegalArgumentException).%New("LeverAdres '"_LeverAdres.GeefNaam()_" "_LeverAdres.GeefAanspreking()_"' van klant '"_Klant.GeefID()_"' kan niet bewaard worden"))
 	}
 ]]></Implementation>
 </Method>
@@ -127,8 +160,8 @@
 <Private>1</Private>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
-	#dim PartijID As DOM.common.PartijID = ##class(DOM.DomeinContext).Instance().GeefLegacyPartijAPI().GeefKlantPartijID(KlantNummer)
-	#dim Partij As DOM.PARTIJ.Partij = ##class(DOM.DomeinContext).Instance().GeefPartijAPI().GeefPartij(PartijID)
+	#dim PartijID As DOM.common.PartijID = ..LegacyPartijApi.GeefKlantPartijID(KlantNummer)
+	#dim Partij As DOM.PARTIJ.Partij = ..PartijApi.GeefPartij(PartijID)
 	#dim KlantIndexKKL As %String = ""
 	If $Data(^KK1(KlantNummer)) {
 		Set KlantIndexKKL = ^KK1(KlantNummer)