Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml
===================================================================
diff -u -r41756 -r41767
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 41756)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 41767)
@@ -48,22 +48,35 @@
 <FormalSpec>Request:WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest</FormalSpec>
 <ReturnType>WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse</ReturnType>
 <Implementation><![CDATA[
-	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ..RegisterContainerRequestConvertor.ConverteerNaarLeveringInfo(Request)
-	#dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData = ..RegistreerBerichtVerzender.VoerUit(LeveringInfo)
-	
-	#dim BevatFout as %Boolean = ..ResponseControleur.ResponseBevatFout(VerzendData.Response)
-	#dim FoutMelding as %String = ""
-	If BevatFout {
-		Set FoutMelding = ..ResponseControleur.GeefFoutInResponse(VerzendData.Response)
-	} Else {
-		Do ..EtiketPrinter.PrintEtiketOpDevice(VerzendData.Response, Request.LabelPrinterId)			
-	}
-
 	#dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
-	Set Response = ..VerzendDataConvertor.ConverteerNaarRegisterContainerResponse(VerzendData,BevatFout,FoutMelding)
-	Set Response.ShipmentId = Request.LeveringNummer
-	Set Response.ContainerId = Request.Container.VerpakkingEenheidId
+	Try{
+		#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo = ..RegisterContainerRequestConvertor.ConverteerNaarLeveringInfo(Request)
+		#dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData = ..RegistreerBerichtVerzender.VoerUit(LeveringInfo)
 	
+		#dim BevatFout as %Boolean = ..ResponseControleur.ResponseBevatFout(VerzendData.Response)
+		#dim FoutMelding as %String = ""
+		If BevatFout {
+			Set FoutMelding = ..ResponseControleur.GeefFoutInResponse(VerzendData.Response)
+		} Else {
+			Do ..EtiketPrinter.PrintEtiketOpDevice(VerzendData.Response, Request.LabelPrinterId)			
+		}
+
+		Set Response = ..VerzendDataConvertor.ConverteerNaarRegisterContainerResponse(VerzendData,BevatFout,FoutMelding)
+		Set Response.ShipmentId = Request.LeveringNummer
+		Set Response.ContainerId = Request.Container.VerpakkingEenheidId
+			
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		If Exception.%ClassName(1) = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%ClassName(1) {
+			Set Response = ##class(WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).%New()
+			Set Response.IsGelukt = $$$False
+			Set Response.Melding = Exception.GeefOmschrijving()
+			Set Response.ShipmentId = Request.LeveringNummer
+			Set Response.ContainerId = Request.Container.VerpakkingEenheidId
+		} else {
+			Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
+		}	
+	}
 	Quit Response
 ]]></Implementation>
 </Method>
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer.cls.xml
===================================================================
diff -u -r40926 -r41767
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer.cls.xml	(.../CancelContainer.cls.xml)	(revision 40926)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer.cls.xml	(.../CancelContainer.cls.xml)	(revision 41767)
@@ -42,7 +42,7 @@
 <FormalSpec>CancelContainerRequest:WS.AX.Transport.GLS.v01.dto.CancelContainerRequest</FormalSpec>
 <ReturnType>WS.AX.Transport.GLS.v01.dto.CancelContainerResponse</ReturnType>
 <Implementation><![CDATA[
-	#Dim Result as WS.AX.Transport.GLS.v01.dto.CancelContainerResponse
+	#Dim Response as WS.AX.Transport.GLS.v01.dto.CancelContainerResponse
 	Try {
 		#dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
 		Set VerzendData = ..CancelContainerRequestConvertor.ConverteerNaarVerzendData(CancelContainerRequest)
@@ -52,12 +52,18 @@
 		
 		#Dim FoutMelding as %String = ""
 		Set:(BevatFout) FoutMelding = ..ResponseControleur.GeefFoutInResponse(CancelVerzendData.Response)
-		Set Result = ..VerzendDataConvertor.ConverteerNaarCancelContainerResponse(BevatFout,FoutMelding)		
-	} Catch{
-		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.GLSUnitException).%ClassName(1))
-		Set Result =  ..VerzendDataConvertor.ConverteerNaarCancelContainerResponse($$$True,Exceptie.GeefOmschrijving())		
+		Set Response = ..VerzendDataConvertor.ConverteerNaarCancelContainerResponse(BevatFout,FoutMelding)		
+	} Catch{		
+		#dim Exceptie As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		if $classname(Exceptie) = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.GLSUnitException).%ClassName(1) {
+			Set Response =  ..VerzendDataConvertor.ConverteerNaarCancelContainerResponse($$$True,Exceptie.GeefOmschrijving())
+		} elseif $classname(Exceptie) = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%ClassName(1) {
+			Set Response = ..VerzendDataConvertor.ConverteerNaarCancelContainerResponse($$$True,Exceptie.GeefOmschrijving())
+		} else {
+			Do ##class(TECH.ExceptionHandler).Rethrow(Exceptie)
+		}		
 	}
-	Quit Result
+	Quit Response
 ]]></Implementation>
 </Method>
 </Class>
Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer/Test.cls.xml
===================================================================
diff -u -r41764 -r41767
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 41764)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 41767)
@@ -105,6 +105,60 @@
 	Do VerzendDataConvertorMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: correcte response teruggeven indien een GLS Comunicatie exceptie gesmeten word">
+<Implementation><![CDATA[
+	#Dim Request as WS.AX.Transport.GLS.v01.dto.CancelContainerRequest	
+	Set Request = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.CancelContainerRequest).GeefRequest()
+
+	#Dim RegistratieVerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
+	Set RegistratieVerzendData = ##class(vhTest.Utils.APPS.TRANSP.GLS.GLSv1.data.VerzendData).GeefVerzendDataRegistratieParcel()
+
+ 	Set BerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.AnnuleerBerichtVerzender).%New()
+	#dim GLSException = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%New("Foutmelding voor gebruiker")
+	Do BerichtVerzenderMock.IndienMethodCall("VoerUit",RegistratieVerzendData).DanException(GLSException)
+	
+	Set CancelContainerRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.CancelContainerRequestConvertor).%New()
+	Do CancelContainerRequestConvertorMock.VerwachtMethodCall("ConverteerNaarVerzendData",Request).DanReturn(RegistratieVerzendData)
+
+	Set CancelContainer = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.CancelContainer).%New(CancelContainerRequestConvertorMock,BerichtVerzenderMock)
+	#Dim CancelResponse as WS.AX.Transport.GLS.v01.dto.CancelContainerResponse
+	Set CancelResponse = CancelContainer.CancelContainer(Request)
+
+	Do $$$AssertEquals(CancelResponse.IsGelukt,$$$False)
+	Do $$$AssertEquals(CancelResponse.Melding,"Foutmelding voor gebruiker")
+			
+	Do CancelContainerRequestConvertorMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: rethrow van andere dan de op te vangen excepties">
+<Implementation><![CDATA[
+	#Dim Request as WS.AX.Transport.GLS.v01.dto.CancelContainerRequest	
+	Set Request = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.CancelContainerRequest).GeefRequest()
+
+	#Dim RegistratieVerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
+	Set RegistratieVerzendData = ##class(vhTest.Utils.APPS.TRANSP.GLS.GLSv1.data.VerzendData).GeefVerzendDataRegistratieParcel()
+
+	Set CancelContainerRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.CancelContainerRequestConvertor).%New()
+	Do CancelContainerRequestConvertorMock.VerwachtMethodCall("ConverteerNaarVerzendData",Request).DanReturn(RegistratieVerzendData)
+
+ 	Set BerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.AnnuleerBerichtVerzender).%New()
+	#dim Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Technische foutmelding")
+	Do BerichtVerzenderMock.IndienMethodCall("VoerUit",RegistratieVerzendData).DanException(Exception)
+	
+
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Technische foutmelding")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1),Substrings))
+
+	Set CancelContainer = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.CancelContainer).%New(CancelContainerRequestConvertorMock,BerichtVerzenderMock)
+ 
+	#Dim CancelResponse as WS.AX.Transport.GLS.v01.dto.CancelContainerResponse
+	Set CancelResponse = CancelContainer.CancelContainer(Request)
+			
+	Do CancelContainerRequestConvertorMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad.cls.xml
===================================================================
diff -u -r41760 -r41767
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad.cls.xml	(.../ConfirmLoad.cls.xml)	(revision 41760)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad.cls.xml	(.../ConfirmLoad.cls.xml)	(revision 41767)
@@ -40,7 +40,7 @@
 		Set Response.IsGelukt = $$$True
 	} catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
-		If Exception.%Classname(1) = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%ClassName(1) {
+		If Exception.%ClassName(1) = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%ClassName(1) {
 			Set Response = ##class(WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).%New()
 			Set Response.IsGelukt = $$$False
 			Set Response.Melding = Exception.GeefOmschrijving()			
Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad/Test.cls.xml
===================================================================
diff -u -r41389 -r41767
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad/Test.cls.xml	(.../Test.cls.xml)	(revision 41389)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad/Test.cls.xml	(.../Test.cls.xml)	(revision 41767)
@@ -3,28 +3,73 @@
 <Class name="vhUnitTest.WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmLoad.Test">
 <Super>vhUnitTest.TestCase</Super>
 
-<Method name="Test ConfirmLoad roept de juiste objecten en methods aan">
+<Method name="Test ConfirmLoad verzend de berichten voor de afzonderlijke glsunits en geeft een response terug">
 <Implementation><![CDATA[
-	#Dim ConfirmLoadRequest as WS.AX.Transport.GLS.v01.dto.ConfirmLoadRequest
-	Set ConfirmLoadRequest = ..GeefConfirmLoadRequest()
+	#Dim ConfirmLoadRequest as WS.AX.Transport.GLS.v01.dto.ConfirmLoadRequest = ..GeefConfirmLoadRequest()
 	
 	Set ConfirmLoadRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmLoadRequestConvertor).%New()
 	Set ConfirmBerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmBerichtVerzender).%New()
 
-	#Dim VerzendDataList as APPS.TRANSP.GLS.GLSv1.data.VerzendDataList
-	Set VerzendDataList = ..GeefVerzendDataList()
+	#Dim VerzendDataList as APPS.TRANSP.GLS.GLSv1.data.VerzendDataList = ..GeefVerzendDataList()
 	Do ConfirmLoadRequestConvertorMock.VerwachtMethodCall("ConverteerNaarVerzendDataList",ConfirmLoadRequest).DanReturn(VerzendDataList)	
 	Do ConfirmBerichtVerzenderMock.VerwachtMethodCall("VoerUit",VerzendDataList).DanDoeNiks()
 
 	Set RegistrationService = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmLoad).%New(ConfirmLoadRequestConvertorMock,ConfirmBerichtVerzenderMock)
-	#Dim Response as WS.AX.Transport.GLS.v01.dto.ConfirmLoadResponse
-	Set Response = RegistrationService.ConfirmLoad(ConfirmLoadRequest)
+
+	#Dim Response as WS.AX.Transport.GLS.v01.dto.ConfirmLoadResponse = RegistrationService.ConfirmLoad(ConfirmLoadRequest)
 	
 	Do ConfirmBerichtVerzenderMock.Verifieer()
 	Do ConfirmLoadRequestConvertorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
+<Method name="Test: correcte response teruggeven indien een GLS Comunicatie exceptie gesmeten word">
+<Implementation><![CDATA[
+	#Dim ConfirmLoadRequest as WS.AX.Transport.GLS.v01.dto.ConfirmLoadRequest = ..GeefConfirmLoadRequest()
+
+	Set ConfirmLoadRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmLoadRequestConvertor).%New()
+	Set ConfirmBerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmBerichtVerzender).%New()
+
+	#Dim VerzendDataList as APPS.TRANSP.GLS.GLSv1.data.VerzendDataList = ..GeefVerzendDataList()
+	Do ConfirmLoadRequestConvertorMock.VerwachtMethodCall("ConverteerNaarVerzendDataList",ConfirmLoadRequest).DanReturn(VerzendDataList)	
+
+	#dim GLSException = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%New("Foutmelding voor gebruiker")
+	Do ConfirmBerichtVerzenderMock.IndienMethodCall("VoerUit",VerzendDataList).DanException(GLSException)
+
+	Set RegistrationService = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmLoad).%New(ConfirmLoadRequestConvertorMock,ConfirmBerichtVerzenderMock)
+	
+	#Dim Response as WS.AX.Transport.GLS.v01.dto.ConfirmLoadResponse = RegistrationService.ConfirmLoad(ConfirmLoadRequest)
+	
+	Do $$$AssertEquals(Response.IsGelukt,$$$False)
+	Do $$$AssertEquals(Response.Melding,"Foutmelding voor gebruiker")
+	
+	Do ConfirmLoadRequestConvertorMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: andere exceptie dan APPS-TRANSP-GLS-Exceptions-CommunicatieException wordt toch gesmeten">
+<Implementation><![CDATA[
+	#Dim ConfirmLoadRequest as WS.AX.Transport.GLS.v01.dto.ConfirmLoadRequest = ..GeefConfirmLoadRequest()
+
+	Set ConfirmLoadRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmLoadRequestConvertor).%New()
+	Set ConfirmBerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmBerichtVerzender).%New()
+
+	#Dim VerzendDataList as APPS.TRANSP.GLS.GLSv1.data.VerzendDataList = ..GeefVerzendDataList()
+	Do ConfirmLoadRequestConvertorMock.VerwachtMethodCall("ConverteerNaarVerzendDataList",ConfirmLoadRequest).DanReturn(VerzendDataList)	
+
+	#dim Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Technische foutmelding")
+	Do ConfirmBerichtVerzenderMock.IndienMethodCall("VoerUit",VerzendDataList).DanException(Exception)
+
+	Set RegistrationService = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.ConfirmLoad).%New(ConfirmLoadRequestConvertorMock,ConfirmBerichtVerzenderMock)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Technische foutmelding")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1),Substrings))
+	
+	
+	#Dim Response as WS.AX.Transport.GLS.v01.dto.ConfirmLoadResponse = RegistrationService.ConfirmLoad(ConfirmLoadRequest)
+]]></Implementation>
+</Method>
+
 <Method name="GeefConfirmLoadRequest">
 <Private>1</Private>
 <ReturnType>WS.AX.Transport.GLS.v01.dto.ConfirmLoadRequest</ReturnType>
Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml
===================================================================
diff -u -r41597 -r41767
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 41597)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 41767)
@@ -5,22 +5,22 @@
 
 <Method name="Test met geslaagde GLS response">
 <Implementation><![CDATA[
-	#Dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
 	Set LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoColli()
 	
-	#Dim Request as WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest	
+	#dim Request as WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest	
 	Set Request = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest).GeefColliRequest("ID1",1,1,0.5)
 
 	Set RegisterContainerRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New()
 	Do RegisterContainerRequestConvertorMock.VerwachtMethodCall("ConverteerNaarLeveringInfo", ..Matches.DataTransferObject(Request)).DanReturn(LeveringInfo)
 	
-	#Dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
+	#dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
 	Set VerzendData = ##class(vhTest.Utils.APPS.TRANSP.GLS.GLSv1.data.VerzendData).GeefVerzendDataRegistratieParcel()
  
  	Set BerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New()
 	Do BerichtVerzenderMock.VerwachtMethodCall("VoerUit",LeveringInfo).DanReturn(VerzendData)
  		
-	#Dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
+	#dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
 	Set Response = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).GeefRegisterContainerResponse()
 	
 	Set EtiketPrinterMock = ##class(vhTest.Mock.APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter).%New()
@@ -45,22 +45,22 @@
 
 <Method name="Test met gefaalde GLS response : etiket niet printen">
 <Implementation><![CDATA[
-	#Dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
 	Set LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoColli()
 	
-	#Dim Request as WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest	
+	#dim Request as WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest	
 	Set Request = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest).GeefColliRequest("ID1",1,1,0.5)
 
 	Set RegisterContainerRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New()
 	Do RegisterContainerRequestConvertorMock.VerwachtMethodCall("ConverteerNaarLeveringInfo", ..Matches.DataTransferObject(Request)).DanReturn(LeveringInfo)
 	
-	#Dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
+	#dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
 	Set VerzendData = ##class(vhTest.Utils.APPS.TRANSP.GLS.GLSv1.data.VerzendData).GeefVerzendDataRegistratieParcelFailed()
  
  	Set BerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New()
 	Do BerichtVerzenderMock.VerwachtMethodCall("VoerUit",LeveringInfo).DanReturn(VerzendData)
  		
-	#Dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
+	#dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse
 	Set Response = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).GeefRegisterContainerResponse()
 	
 	Set EtiketPrinterMock = ##class(vhTest.Mock.APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter).%New()
@@ -81,6 +81,72 @@
 	Do ResponseControleur.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Indien GLScomponent een GLS exception smijt wordt een response met isgelukt is false en een melding terug gegeven">
+<Implementation><![CDATA[
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
+	Set LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoColli()
+	
+	#dim Request as WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest	
+	Set Request = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest).GeefColliRequest("ID1",1,1,0.5)
+
+	Set RegisterContainerRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New()
+	Do RegisterContainerRequestConvertorMock.VerwachtMethodCall("ConverteerNaarLeveringInfo", ..Matches.DataTransferObject(Request)).DanReturn(LeveringInfo)
+	
+	#dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
+	Set VerzendData = ##class(vhTest.Utils.APPS.TRANSP.GLS.GLSv1.data.VerzendData).GeefVerzendDataRegistratieParcel()
+ 
+ 	Set BerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New()
+ 	#dim GLSException = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%New("Foutmelding voor gebruiker")
+	Do BerichtVerzenderMock.IndienMethodCall("VoerUit",LeveringInfo).DanException(GLSException)
+	
+	Set EtiketPrinterMock = ##class(vhTest.Mock.APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter).%New()
+	 
+	Set ResponseControleur = ##class(vhTest.Mock.APPS.TRANSP.GLS.GLSv1.impl.ResponseControleur).%New()
+ 
+	Set VerzendDataConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor).%New()
+	 
+	Set RegisterContainer = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainer).%New(RegisterContainerRequestConvertorMock,BerichtVerzenderMock,VerzendDataConvertorMock,EtiketPrinterMock,,ResponseControleur)
+	#dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse = RegisterContainer.RegisterContainer(Request)
+		
+	Do $$$AssertEquals(Response.IsGelukt,$$$False)
+	DO $$$AssertEquals(Response.Melding,"Foutmelding voor gebruiker","")
+
+	Do RegisterContainerRequestConvertorMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: indien GLScomponent een andere exception smijt wordt deze toch verder gesmeten">
+<Implementation><![CDATA[
+	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
+	Set LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoColli()
+	
+	#dim Request as WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest	
+	Set Request = ##class(vhTest.Utils.WS.AX.Transport.GLS.v01.dto.RegisterContainerRequest).GeefColliRequest("ID1",1,1,0.5)
+
+	Set RegisterContainerRequestConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainerRequestConvertor).%New()
+	Do RegisterContainerRequestConvertorMock.VerwachtMethodCall("ConverteerNaarLeveringInfo", ..Matches.DataTransferObject(Request)).DanReturn(LeveringInfo)
+	
+	#dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
+	Set VerzendData = ##class(vhTest.Utils.APPS.TRANSP.GLS.GLSv1.data.VerzendData).GeefVerzendDataRegistratieParcel()
+ 
+ 	Set BerichtVerzenderMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.RegistreerBerichtVerzender).%New()
+	#dim Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Technische foutmelding")
+	Do BerichtVerzenderMock.IndienMethodCall("VoerUit",LeveringInfo).DanException(Exception)
+	
+	Set EtiketPrinterMock = ##class(vhTest.Mock.APPS.TRANSP.GLS.GLSv1.impl.EtiketPrinter).%New()
+	 
+	Set ResponseControleur = ##class(vhTest.Mock.APPS.TRANSP.GLS.GLSv1.impl.ResponseControleur).%New()
+ 
+	Set VerzendDataConvertorMock = ##class(vhTest.Mock.WSimpl.AX.Transport.GLS.v01.RegistrationService.VerzendDataConvertor).%New()
+	 
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Technische foutmelding")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1),Substrings))
+	 
+	Set RegisterContainer = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.RegisterContainer).%New(RegisterContainerRequestConvertorMock,BerichtVerzenderMock,VerzendDataConvertorMock,EtiketPrinterMock,,ResponseControleur)
+	#dim Response as WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse = RegisterContainer.RegisterContainer(Request)
+]]></Implementation>
+</Method>
 </Class>