Index: WS/EC/Unishop/InternationaleZending/DummyService.cls.xml
===================================================================
diff -u -r33345 -r33367
--- WS/EC/Unishop/InternationaleZending/DummyService.cls.xml	(.../DummyService.cls.xml)	(revision 33345)
+++ WS/EC/Unishop/InternationaleZending/DummyService.cls.xml	(.../DummyService.cls.xml)	(revision 33367)
@@ -17,15 +17,15 @@
 <Method name="OngeldigeVerzendKeuze">
 <Private>1</Private>
 <Implementation><![CDATA[
-	set Exception = ##class(TECH.Exceptions.InvalidUserInputException).%New("Ongeldige verzend keuze.")	
+	set Exception = ##class(TECH.Exceptions.OngeldigeVerzendKeuze).%New("Ongeldige verzend keuze.")	
 	do ##class(TECH.ExceptionHandler).Throw(Exception)
 ]]></Implementation>
 </Method>
 
 <Method name="OngeldigeOptieKeuze">
 <Private>1</Private>
 <Implementation><![CDATA[
-	set Exception = ##class(TECH.Exceptions.InvalidUserInputException).%New("Ongeldige optie keuze.")	
+	set Exception = ##class(TECH.Exceptions.OngeldigeOptieKeuze).%New("Ongeldige optie keuze.")	
 	do ##class(TECH.ExceptionHandler).Throw(Exception)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/WS/EC/Unishop/InternationaleZending/DummyService/Test.cls.xml
===================================================================
diff -u -r33261 -r33367
--- vhUnitTest/WS/EC/Unishop/InternationaleZending/DummyService/Test.cls.xml	(.../Test.cls.xml)	(revision 33261)
+++ vhUnitTest/WS/EC/Unishop/InternationaleZending/DummyService/Test.cls.xml	(.../Test.cls.xml)	(revision 33367)
@@ -35,7 +35,7 @@
 	Set VerzendingKeuze.OptieKeuze.Prijs = 40.0  
 	
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Ongeldige verzend keuze.")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidUserInputException",Substrings))
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.OngeldigeVerzendKeuze",Substrings))
 
 	#dim TestUnit As WS.EC.Unishop.InternationaleZending.DummyService = ##class(WS.EC.Unishop.InternationaleZending.DummyService).%New()
 	Do TestUnit.BewaarGekozenVerzending(OfferteId, VerzendingKeuze)
@@ -56,7 +56,7 @@
 	Set VerzendingKeuze.OptieKeuze.Prijs = 40.0  
 
 	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Ongeldige optie keuze.")
-	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidUserInputException",Substrings))
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.OngeldigeOptieKeuze",Substrings))
 	
 	#dim TestUnit As WS.EC.Unishop.InternationaleZending.DummyService = ##class(WS.EC.Unishop.InternationaleZending.DummyService).%New()
 	Do TestUnit.BewaarGekozenVerzending(OfferteId, VerzendingKeuze)