Index: APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r36435 -r36486
--- APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 36435)
+++ APPS/TRANSP/Offerte/impl/UPS/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 36486)
@@ -59,19 +59,30 @@
 <FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
-	Do ..BerekenInputValideerder.Valideer(BerekenInput)
-
+	#dim Exception As %String = ""
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+	
+	Try {
+		Do ..BerekenInputValideerder.Valideer(BerekenInput)
+	} Catch {
+		Set Exception = ##class(TECH.ExceptionHandler).Catch().ToString()
+	}
+	
 	#dim BerekenRequest As APPS.TRANSP.Offerte.impl.UPS.BerekenRequest = ##class(APPS.TRANSP.Offerte.impl.UPS.BerekenRequest).%New()
 	Set BerekenRequest.BerekenInput = BerekenInput
 
 	try {
 		#dim BerekenResponse As APPS.TRANSP.Offerte.impl.UPS.BerekenResponse = ..Process(BerekenRequest)
+		Set OfferteData = BerekenResponse.BerekenResult
 	}catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		Do ##class(TECH.Exceptions.OngeldigeGegevensOntvangen).Throw(Exception.ToString())
+		Do OfferteData.Exceptions.Insert(##class(TECH.ExceptionHandler).Catch().ToString())
 	}
 	
-	Quit BerekenResponse.BerekenResult
+	if $IsObject(Exception) {
+		Do OfferteData.Exceptions.Insert(Exception)
+	}
+	
+	Quit OfferteData
 ]]></Implementation>
 </Method>
 
Index: APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml
===================================================================
diff -u -r36370 -r36486
--- APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 36370)
+++ APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar.cls.xml	(.../OfferteBerekenaar.cls.xml)	(revision 36486)
@@ -51,14 +51,28 @@
 <FormalSpec>BerekenInput:APPS.TRANSP.OfferteService.dto.BerekenInput</FormalSpec>
 <ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
+	Set ..BerekenInput = BerekenInput
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
+
 	Try {
-		Set ..BerekenInput = BerekenInput
 		Set ..TransportDuur = ..TransportduurRepository.GeefViaLandEnPostCode(BerekenInput.LeverAdres.LandCode,BerekenInput.LeverAdres.Postcode) 
+	} Catch {
+		Do OfferteData.Exceptions.Insert(##class(TECH.ExceptionHandler).Catch().ToString())
+	}
+
+	Try {
 		Set ..TransportTarief = ..BerekenTarief()
 	} Catch {
-		Do ..ThrowExceptie()
+		Do OfferteData.Exceptions.Insert(##class(TECH.ExceptionHandler).Catch().ToString())
 	}
-	Quit ..MaakOfferteData()
+	
+	try {
+		Do ..MaakOfferteData(.OfferteData)
+	}catch {
+		Do OfferteData.Exceptions.Insert(##class(TECH.ExceptionHandler).Catch().ToString())
+	}
+	
+	Quit OfferteData
 ]]></Implementation>
 </Method>
 
@@ -79,26 +93,10 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ThrowExceptie">
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-	If Exceptie.GeefExceptionCode() = ##class(TECH.enu.ExceptionCode).DataNotFound()
-	{ 
-		#dim NieuweExceptie As APPS.TRANSP.Offerte.exc.TransportOfferteBerekenExceptie = ##class(APPS.TRANSP.Offerte.exc.TransportOfferteBerekenExceptie).%New("")
-		Do NieuweExceptie.VoegToeInnerExceptie(Exceptie)
-		Do ##class(TECH.ExceptionHandler).Throw(NieuweExceptie)
-	} Else {
-		Do ##class(TECH.ExceptionHandler).Throw(Exceptie)
-	}
-]]></Implementation>
-</Method>
-
 <Method name="MaakOfferteData">
+<FormalSpec><![CDATA[&OfferteData:APPS.TRANSP.OfferteService.dto.OfferteData]]></FormalSpec>
 <Private>1</Private>
-<ReturnType>APPS.TRANSP.OfferteService.dto.OfferteData</ReturnType>
 <Implementation><![CDATA[
-	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ##class(APPS.TRANSP.OfferteService.dto.OfferteData).%New()
 	#dim OfferteItem As APPS.TRANSP.OfferteService.dto.OfferteItem = ##class(APPS.TRANSP.OfferteService.dto.OfferteItem).%New()
 	
 	#dim TransportService As APPS.TRANSP.OfferteService.dto.ServiceCode = ..GeefTransportServiceCode(1,1)
@@ -112,13 +110,12 @@
 
 	#dim DuurtijdInWerkDagen As %Integer = ..TransportDuur.DuurtijdPerWeekdagNr.GetAt(VroegsteAfhaalDag)
 	Set OfferteItem.LeverDatum = ..BerekenLeverDag(..BerekenInput.VroegsteAfhaalDatum,DuurtijdInWerkDagen)
-	Set OfferteItem.Duurtijd = ##class(TECH.DateTime).DatumVerschil(..BerekenInput.VroegsteAfhaalDatum, OfferteItem.LeverDatum)
+	Set OfferteItem.Duurtijd = DuurtijdInWerkDagen
 	Set OfferteItem.LeverDag = ..GeefLeverDagAfkorting(##class(TECH.DateUtils).DayNumber(OfferteItem.LeverDatum))
 	Set OfferteItem.LeverTijd = ##class(%Library.Time).DisplayToLogical("12:00")
 	Set OfferteItem.OphaalDatum = ..BerekenInput.VroegsteAfhaalDatum
 	
 	Do OfferteData.Items.Insert(OfferteItem)
-	Quit OfferteData
 ]]></Implementation>
 </Method>
 
Index: vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml
===================================================================
diff -u -r36370 -r36486
--- vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 36370)
+++ vhUnitTest/APPS/TRANSP/Offerte/impl/DHL/OfferteBerekenaar/Test.cls.xml	(.../Test.cls.xml)	(revision 36486)
@@ -32,10 +32,8 @@
 	#dim DataNotFoundException As TECH.Exceptions.DataNotFoundException = ##class(TECH.Exceptions.DataNotFoundException).%New("")
 	Do TransportduurRepositoryMock.IndienMethodCall("GeefViaLandEnPostCode", $$$ElkeWaarde,$$$ElkeWaarde).DanException(DataNotFoundException)
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Er is een fout opgetreden bij het ophalen van de transportgegevens")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("APPS.TRANSP.Offerte.exc.TransportOfferteBerekenExceptie",Substrings))
-	
-	Do OfferteBerekenaar.Bereken(..GeefBerekenInput("OngeldigeLandCode"))
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = OfferteBerekenaar.Bereken(..GeefBerekenInput("OngeldigeLandCode"))
+	Do $$$AssertContains(OfferteData.Exceptions.GetAt(1),"TECH.Exceptions.DataNotFoundException")
 ]]></Implementation>
 </Method>
 
@@ -46,10 +44,8 @@
 	#dim FileExceptie As TECH.Exceptions.DataNotFoundException = ##class(TECH.Exceptions.FileException).%New("DummyOmschrijving",1)
 	Do TransportduurRepositoryMock.IndienMethodCall("GeefViaLandEnPostCode", $$$ElkeWaarde,$$$ElkeWaarde).DanException(FileExceptie)
 	
-	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("DummyOmschrijving")
-	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.FileException",Substrings))
-	
-	Do OfferteBerekenaar.Bereken(..GeefBerekenInput("OngeldigeLandCode"))
+	#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = OfferteBerekenaar.Bereken(..GeefBerekenInput("OngeldigeLandCode"))
+	Do $$$AssertContains(OfferteData.Exceptions.GetAt(1),"TECH.Exceptions.FileException")
 ]]></Implementation>
 </Method>
 
@@ -59,7 +55,7 @@
 <Implementation><![CDATA[
 	Do $$$AssertEquals(OfferteDataResult.Items.Count(), 1)
 	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDag,"Wed")
-	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Duurtijd,6)
+	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).Duurtijd,4)
 	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverDatum,64042)
 	Do $$$AssertEquals(OfferteDataResult.Items.GetAt(1).LeverTijd,43200)
 ]]></Implementation>
Index: WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml
===================================================================
diff -u -r36225 -r36486
--- WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(.../ZendingDetails.cls.xml)	(revision 36225)
+++ WS/EC/Unishop/InternationaleZending/impl/ZendingDetails.cls.xml	(.../ZendingDetails.cls.xml)	(revision 36486)
@@ -41,21 +41,58 @@
 	Do ..ZetVertaler(Taal)
 	
 	#dim ZendingDetails As WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden = ##class(WS.EC.ExterneVerkoop.dto.VerzendingMogelijkheden).%New()
+	#dim Exceptions As List Of %String = ##class(%ListOfDataTypes).%New()
 	
 	#dim TransportFirmas As TECH.ListIterator = ##class(APPS.TRANSP.enu.TransportFirma).ValueListIterator()
 	While TransportFirmas.HasNext() {
 		#dim TransportFirma As %String = TransportFirmas.Next()
-		#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TransportOfferteService.BerekenOfferte(TransportFirma, BerekenInput)
-		#dim OfferteDataIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(OfferteData.Items)
-		While OfferteDataIterator.HasNext()	{
-			Do ZendingDetails.Insert(..GeefZendingDetail(TransportFirma, OfferteDataIterator.Next()))
-		} 
+		try {
+			#dim OfferteData As APPS.TRANSP.OfferteService.dto.OfferteData = ..TransportOfferteService.BerekenOfferte(TransportFirma, BerekenInput)
+			Do ..VoegToeExcepties(.Exceptions, OfferteData.Exceptions)
+			#dim OfferteDataIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(OfferteData.Items)
+			While OfferteDataIterator.HasNext()	{
+				Do ZendingDetails.Insert(..GeefZendingDetail(TransportFirma, OfferteDataIterator.Next()))
+			} 
+		} catch {
+			Do Exceptions.Insert(##class(TECH.ExceptionHandler).Catch().ToString())
+		}
 	}
 	
+	If (Exceptions.Count() > 0)
+	{
+		Do ..ThrowException(Exceptions)	
+	}
+	
 	Quit ZendingDetails
 ]]></Implementation>
 </Method>
 
+<Method name="VoegToeExcepties">
+<FormalSpec><![CDATA[&Exceptions:%List,ToeTeVoegenExceptions:%List]]></FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim ExceptionsIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(ToeTeVoegenExceptions)
+	While ExceptionsIterator.HasNext()
+	{
+		Do Exceptions.Insert(ExceptionsIterator.Next())
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ThrowException">
+<FormalSpec>Exceptions:%List</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#Dim ExceptionsIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(Exceptions)
+	#Dim ExceptionString As TECH.String = ""
+	While ExceptionsIterator.HasNext()
+	{
+		Set ExceptionString = ExceptionString _$C(13,10) _ExceptionsIterator.Next()
+	}
+	Do ##class(TECH.Exceptions.GeneralErrorException).Throw(ExceptionString)
+]]></Implementation>
+</Method>
+
 <Method name="GeefZendingDetail">
 <FormalSpec>TransportFirma:%String,OfferteItem:APPS.TRANSP.OfferteService.dto.OfferteItem</FormalSpec>
 <Private>1</Private>
Index: APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml
===================================================================
diff -u -r34831 -r36486
--- APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(.../OfferteData.cls.xml)	(revision 34831)
+++ APPS/TRANSP/OfferteService/dto/OfferteData.cls.xml	(.../OfferteData.cls.xml)	(revision 36486)
@@ -28,6 +28,22 @@
 <Parameter name="XMLPROJECTION" value="COLLECTION"/>
 </Property>
 
+<Property name="Exceptions">
+<Type>%String</Type>
+<Collection>list</Collection>
+<Parameter name="XMLITEMNAME" value="Exceptions"/>
+<Parameter name="XMLNAME" value="Exceptions"/>
+<Parameter name="XMLPROJECTION" value="COLLECTION"/>
+</Property>
+
+<Property name="Details">
+<Type>%String</Type>
+<Collection>list</Collection>
+<Parameter name="XMLITEMNAME" value="Details"/>
+<Parameter name="XMLNAME" value="Details"/>
+<Parameter name="XMLPROJECTION" value="COLLECTION"/>
+</Property>
+
 <Storage name="Default">
 <Type>%Library.CacheSerialState</Type>
 <State>OfferteDataState</State>
@@ -36,6 +52,12 @@
 <Value name="1">
 <Value>Items</Value>
 </Value>
+<Value name="2">
+<Value>Exceptions</Value>
+</Value>
+<Value name="3">
+<Value>Details</Value>
+</Value>
 </Data>
 </Storage>
 </Class>