Index: APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r32805 -r32835
--- APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 32805)
+++ APPS/TRANSP/UPS/impl/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 32835)
@@ -39,9 +39,15 @@
 <Implementation><![CDATA[
 	Do ..BerekenInputValideerder.Valideer(BerekenInput)
 
-	#dim RateOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..RateOfferteBerekenaar.Bereken(BerekenInput)
-	#dim TimeInTransitOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TimeInTransitOfferteBerekenaar.Bereken(BerekenInput)
+	try {
+		#dim RateOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..RateOfferteBerekenaar.Bereken(BerekenInput)
+		#dim TimeInTransitOfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TimeInTransitOfferteBerekenaar.Bereken(BerekenInput)
+	}catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ##class(TECH.Exceptions.GeneralErrorException).Throw(Exception.ToString())
+	}
 	
+	
 	Quit ..MergeOfferteData(RateOfferteData, TimeInTransitOfferteData)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/BerekenInputValidator/Test.cls.xml
===================================================================
diff -u -r32804 -r32835
--- vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/BerekenInputValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32804)
+++ vhUnitTest/APPS/TRANSP/UPS/impl/OfferteBerekenaar/BerekenInputValidator/Test.cls.xml	(.../Test.cls.xml)	(revision 32835)
@@ -12,7 +12,7 @@
 		Do BerekenInputValideerder.Valideer(BerekenInput)
 		Do $$$AssertFalse(1)
 	} catch {
-		#dim Exceptie As TECH.Exception.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
 		Do $$$AssertEquals(Exceptie.ToString(), "TeVerzendenItems")
 	}
@@ -38,7 +38,7 @@
 		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputWoonplaatsLeeg())
 		Do $$$AssertFalse(1)
 	} catch {
-		#dim Exceptie As TECH.Exception.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
 		Do $$$AssertEquals(Exceptie.ToString(), "Woonplaats")
 	}
@@ -53,7 +53,7 @@
 		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputPostcodeLeeg())
 		Do $$$AssertFalse(1)
 	} catch {
-		#dim Exceptie As TECH.Exception.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
 		Do $$$AssertEquals(Exceptie.ToString(), "Postcode")
 	}
@@ -68,7 +68,7 @@
 		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputLandcodeLeeg())
 		Do $$$AssertFalse(1)
 	} catch {
-		#dim Exceptie As TECH.Exception.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
 		Do $$$AssertEquals(Exceptie.ToString(), "LandCode")
 	}
@@ -83,7 +83,7 @@
 		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputProcinviecodeLeeg())
 		Do $$$AssertFalse(1)
 	} catch {
-		#dim Exceptie As TECH.Exception.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
 		Do $$$AssertEquals(Exceptie.ToString(), "ProvincieCode")
 	}
@@ -117,7 +117,7 @@
 		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputMetDatum(##class(TECH.DateTime).TextToDate("11/03/2015")))
 		Do $$$AssertFalse(1)
 	} catch {
-		#dim Exceptie As TECH.Exception.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
 		Do $$$AssertEquals(Exceptie.ToString(), "GewensteLeverDatum")
 	}
@@ -132,7 +132,7 @@
 		Do BerekenInputValideerder.Valideer(..GeefBerekeningInputMetDatum(##class(TECH.DateTime).TextToDate("29/11/2035")))
 		Do $$$AssertFalse(1)
 	} catch {
-		#dim Exceptie As TECH.Exception.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
+		#dim Exceptie As TECH.Exceptions.TemplateBaseException = ##class(TECH.ExceptionHandler).Catch()
 		Do $$$AssertEquals(Exceptie.GeefExceptionCode(),##class(TECH.enu.ExceptionCode).InvalidInput())
 		Do $$$AssertEquals(Exceptie.ToString(), "GewensteLeverDatum")
 	}
Index: APPS/TRANSP/UPS/impl/BerekenInputValidator.cls.xml
===================================================================
diff -u -r32804 -r32835
--- APPS/TRANSP/UPS/impl/BerekenInputValidator.cls.xml	(.../BerekenInputValidator.cls.xml)	(revision 32804)
+++ APPS/TRANSP/UPS/impl/BerekenInputValidator.cls.xml	(.../BerekenInputValidator.cls.xml)	(revision 32835)
@@ -4,7 +4,7 @@
 <Super>APPS.TRANSP.UPS.BerekenInputValidator</Super>
 
 <Property name="Exceptie">
-<Type>TECH.Exception.TemplateBaseException</Type>
+<Type>TECH.Exceptions.TemplateBaseException</Type>
 </Property>
 
 <Method name="Valideer">
@@ -122,7 +122,7 @@
 	if ($IsObject(..Exceptie)) {
 		Do ..Exceptie.AddObject(PropertyNaam)
 	} else {
-		Set ..Exceptie= ##class(TECH.Exception.TemplateBaseException).%New(##class(TECH.enu.ExceptionCode).InvalidInput(), PropertyNaam)
+		Set ..Exceptie= ##class(TECH.Exceptions.TemplateBaseException).%New(##class(TECH.enu.ExceptionCode).InvalidInput(), PropertyNaam)
 	}
 ]]></Implementation>
 </Method>