Index: WSimpl/Vhisie4/Winkelkar/WinkelkarRepository.cls.xml
===================================================================
diff -u -r39125 -r39172
--- WSimpl/Vhisie4/Winkelkar/WinkelkarRepository.cls.xml	(.../WinkelkarRepository.cls.xml)	(revision 39125)
+++ WSimpl/Vhisie4/Winkelkar/WinkelkarRepository.cls.xml	(.../WinkelkarRepository.cls.xml)	(revision 39172)
@@ -37,23 +37,54 @@
 <Method name="GeefWinkelkarIDViaID">
 <FormalSpec>ID:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..WinkelkarRepository.GeefViaExterneId(ID).GeefID()
+<Implementation><![CDATA[
+	Try {
+		#dim WinkelkarID As %String = ..WinkelkarRepository.GeefViaExterneId(ID).GeefID()
+	} Catch {
+		Do ..VerwerktExceptie(ID, ##class(TECH.ExceptionHandler).Catch())
+	}
+	Quit WinkelkarID
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOfferteIDViaID">
 <FormalSpec>ID:%String</FormalSpec>
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..OfferteRepository.GeefViaExterneId(ID).GeefID()
+<Implementation><![CDATA[
+	Try {
+		#dim OfferteID As %String = ..OfferteRepository.GeefViaExterneId(ID).GeefID()
+	} Catch {
+		Do ..VerwerktExceptie(ID, ##class(TECH.ExceptionHandler).Catch())
+	}
+	Quit OfferteID
 ]]></Implementation>
 </Method>
 
 <Method name="GeefOfferteViaID">
 <FormalSpec>ID:%String</FormalSpec>
 <ReturnType>APPS.VKP.impl.Offerte</ReturnType>
-<Implementation><![CDATA[	Quit ..OfferteRepository.GeefViaExterneId(ID)
+<Implementation><![CDATA[
+	Try {
+		#dim Offerte As APPS.VKP.impl.Offerte = ..OfferteRepository.GeefViaExterneId(ID)
+	} Catch {
+		Do ..VerwerktExceptie(ID, ##class(TECH.ExceptionHandler).Catch())
+	}
+	Quit Offerte
 ]]></Implementation>
 </Method>
+
+<Method name="VerwerktExceptie">
+<FormalSpec>ID:%String,Exceptie:TECH.Exceptions.Exception</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	If Exceptie.%ClassName(1)="TECH.Exceptions.DataNotFoundException"{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Winkelkar met ID "_ID _" bestaat niet."))			
+
+	}Else{
+		Do ##class(TECH.ExceptionHandler).Rethrow(Exceptie)
+	}
+]]></Implementation>
+</Method>
 </Class>