Index: vhUnitTest/APPS/EC/Winkelkar/impl/TestAuthorisatieControleur.cls.xml
===================================================================
diff -u -r41333 -r41411
--- vhUnitTest/APPS/EC/Winkelkar/impl/TestAuthorisatieControleur.cls.xml	(.../TestAuthorisatieControleur.cls.xml)	(revision 41333)
+++ vhUnitTest/APPS/EC/Winkelkar/impl/TestAuthorisatieControleur.cls.xml	(.../TestAuthorisatieControleur.cls.xml)	(revision 41411)
@@ -104,7 +104,7 @@
 		Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetOfferte(OfferteEnWinkelkar1.OfferteID)
 	}Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do $$$AssertEquals($P(Exception.GeefOmschrijving()," ("),"Offerte '"_OfferteEnWinkelkar1.OfferteID_"' Is Vhisie4.")
+		Do $$$AssertEquals($P(Exception.GeefOmschrijving()," ("),"Offerte '"_OfferteEnWinkelkar1.OfferteID_"' is een Vhisie4-offerte")
 		Set IsFoutmeldingGeraised = 1
 	}
 	Do $$$AssertTrue(IsFoutmeldingGeraised,"Er is foutmelding geraised, geen toegang tot offerte")
@@ -125,7 +125,7 @@
 		Do ##class(APPS.ApplicatieContext).Instance().GeefECommerceAPI().GeefAuthorisatieControleur().ControleerWerkenMetWinkelkar(Winkelkar1.WinkelkarID)
 	}Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do $$$AssertEquals($P(Exception.GeefOmschrijving()," ("),"Winkelkar '"_ Winkelkar1.WinkelkarID _"' Is Vhisie4.")
+		Do $$$AssertEquals($P(Exception.GeefOmschrijving()," ("),"Winkelkar '"_ Winkelkar1.WinkelkarID _"' is een Vhisie4-winkelkar")
 		Set IsFoutmeldingGeraised = 1
 	}
 	Do $$$AssertTrue(IsFoutmeldingGeraised,"Er is foutmelding geraised, geen toegang tot winkelkar")
Index: APPS/EC/Winkelkar/impl/AuthorisatieControleur.cls.xml
===================================================================
diff -u -r41350 -r41411
--- APPS/EC/Winkelkar/impl/AuthorisatieControleur.cls.xml	(.../AuthorisatieControleur.cls.xml)	(revision 41350)
+++ APPS/EC/Winkelkar/impl/AuthorisatieControleur.cls.xml	(.../AuthorisatieControleur.cls.xml)	(revision 41411)
@@ -18,6 +18,16 @@
 <Private>1</Private>
 </Property>
 
+<Property name="OfferteRepository">
+<Type>APPS.VKP.Offerte.OfferteRepository</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="WinkelkarRepository">
+<Type>DOM.EC.Winkelkar.impl.WinkelkarRepository</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>GebruikerApi:DOM.common.GebruikerAPI</FormalSpec>
 <Private>1</Private>
@@ -28,6 +38,8 @@
 	Set ..GebruikerApi = $$$Inject(GebruikerApi,##class(DOM.DomeinContext).Instance().GeefGebruikerAPI())
 	Set ..VerkoopApi = ##class(APPS.ApplicatieContext).Instance().GeefVerkoopAPI()
 	Set ..RuntimeContext = ##class(TECH.Context.RuntimeContext).Instance()
+	Set ..OfferteRepository = ##class(APPS.VKP.Offerte.impl.OfferteRepository).%New()
+	Set ..WinkelkarRepository = ##class(DOM.EC.Winkelkar.impl.WinkelkarRepository).%New()
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -36,13 +48,13 @@
 <Method name="ControleerWerkenMetWinkelkar">
 <FormalSpec>WinkelkarID:%String</FormalSpec>
 <Implementation><![CDATA[
-	If '##class(DOM.EC.Winkelkar.Winkelkar).%ExistsId(WinkelkarID){
+	If $$$Not(..WinkelkarRepository.BestaatViaID(WinkelkarID)){
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Winkelkar '"_WinkelkarID_"' bestaat niet."))	
 	}
 		
 	#dim Winkelkar As DOM.EC.Winkelkar.Winkelkar = ##class(DOM.EC.Winkelkar.Winkelkar).OpenId(WinkelkarID)
 	if $Length(Winkelkar.ExterneId){
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Winkelkar '"_WinkelkarID_"' Is Vhisie4."))	
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Winkelkar '"_WinkelkarID_"' is een Vhisie4-winkelkar"))	
 	}
 	Do ..ControleerHeeftToegangTotKlant(Winkelkar.GeefKlantID(),"tot winkelkar '"_WinkelkarID_"'")
 ]]></Implementation>
@@ -63,13 +75,13 @@
 <Method name="ControleerWerkenMetOfferte">
 <FormalSpec>OfferteID:%String</FormalSpec>
 <Implementation><![CDATA[
-	If '##class(APPS.VKP.impl.Offerte).%ExistsId(OfferteID){
+	If $$$Not(..OfferteRepository.BestaatViaID(OfferteID)) {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Offerte '"_OfferteID_"' bestaat niet."))	
 	}
 		
 	#dim Offerte As APPS.VKP.Offerte = ..VerkoopApi.GeefOfferteService().GeefOfferte(OfferteID)
 	if $Length(Offerte.GeefExterneId()){
-		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Offerte '"_OfferteID_"' Is Vhisie4."))	
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.GeneralErrorException).%New("Offerte '"_OfferteID_"' is een Vhisie4-offerte"))	
 	}
 	Do ..ControleerHeeftToegangTotKlant(Offerte.KlantID,"tot offerte '"_OfferteID_"'")
 ]]></Implementation>