Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer/Test.cls.xml
===================================================================
diff -u -r42173 -r42209
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 42173)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 42209)
@@ -132,7 +132,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: rethrow van andere dan de op te vangen excepties">
+<Method name="Test: aangepaste melding voor 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()
@@ -146,15 +146,14 @@
  	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 $$$AssertEquals(CancelResponse.IsGelukt,$$$False)
+	Do $$$AssertEquals(CancelResponse.Melding,"Gelieve IT te contacteren : Technische foutmelding")
 			
 	Do CancelContainerRequestConvertorMock.Verifieer()
 ]]></Implementation>
Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ReprintContainer/Test.cls.xml
===================================================================
diff -u -r41765 -r42209
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ReprintContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 41765)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ReprintContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 42209)
@@ -67,8 +67,7 @@
 
 <Method name="Test ReprintContainer van GLSUnitId waarvan send niet gelukt is">
 <Implementation><![CDATA[
-	#Dim Request as WS.AX.Transport.GLS.v01.dto.ReprintContainerRequest
-	Set Request = ..GeefReprintContainerRequest()
+	#Dim Request as WS.AX.Transport.GLS.v01.dto.ReprintContainerRequest = ..GeefReprintContainerRequest()
 	
 	Do ..VerzendDataRepositoryMock.VerwachtMethodCall("BestaatViaUnitID","GLSUnitID1").DanReturn($$$True)
 	
@@ -111,6 +110,23 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test Excepties worden opgevangen en een aangepaste melding wordt in de response gezet">
+<Implementation><![CDATA[
+
+	#dim Exception = ##class(TECH.Exceptions.GeneralErrorException).%New("Technische foutmelding")
+	Do ..VerzendDataRepositoryMock.IndienMethodCall("BestaatViaUnitID","GLSUnitID1").DanException(Exception)
+	
+	
+	#Dim Response as WS.AX.Transport.GLS.v01.dto.ReprintContainerResponse
+	#Dim Request as WS.AX.Transport.GLS.v01.dto.ReprintContainerRequest = ..GeefReprintContainerRequest()
+	Set ReprintContainer = ##class(WSimpl.AX.Transport.GLS.v01.RegistrationService.ReprintContainer).%New(..VerzendDataRepositoryMock,..EtiketPrinterMock)
+	Set Response = ReprintContainer.ReprintContainer(Request)
+	
+	Do $$$AssertEquals(Response.IsGelukt,$$$False)
+	Do $$$AssertEquals(Response.Melding,"Gelieve IT te contacteren : Technische foutmelding")
+]]></Implementation>
+</Method>
+
 <Method name="GeefReprintContainerRequest">
 <Private>1</Private>
 <ReturnType>WS.AX.Transport.GLS.v01.dto.ReprintContainerRequest</ReturnType>
Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml
===================================================================
diff -u -r41767 -r42209
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 41767)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer/Test.cls.xml	(.../Test.cls.xml)	(revision 42209)
@@ -110,13 +110,13 @@
 	#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 $$$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">
+<Method name="Test: indien GLScomponent een niet voorziene exception smijt moet een aangepaste melding teruggegeven worden">
 <Implementation><![CDATA[
 	#dim LeveringInfo as APPS.TRANSP.dto.LeveringInfo
 	Set LeveringInfo = ##class(vhTest.Utils.APPS.TRANSP.dto.LeveringInfo).GeefLeveringInfoColli()
@@ -133,18 +133,19 @@
  	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)
+		
+	Do $$$AssertEquals(Response.IsGelukt,$$$False)
+	Do $$$AssertEquals(Response.Melding,"Gelieve IT te contacteren : Technische foutmelding","")
+
+	Do RegisterContainerRequestConvertorMock.Verifieer()
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml
===================================================================
diff -u -r41767 -r42209
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 41767)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/RegisterContainer.cls.xml	(.../RegisterContainer.cls.xml)	(revision 42209)
@@ -67,14 +67,15 @@
 			
 	} 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
+		
+		If Exception.%ClassName(1) = ##class(APPS.TRANSP.GLS.Exceptions.CommunicatieException).%ClassName(1) {
+			Set Response.Melding = Exception.GeefOmschrijving()			
 		} else {
-			Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
+			Set Response.Melding = "Gelieve IT te contacteren : "_ Exception.GeefOmschrijving()						
 		}	
 	}
 	Quit Response
Index: vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad/Test.cls.xml
===================================================================
diff -u -r41767 -r42209
--- vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad/Test.cls.xml	(.../Test.cls.xml)	(revision 41767)
+++ vhUnitTest/WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad/Test.cls.xml	(.../Test.cls.xml)	(revision 42209)
@@ -47,7 +47,7 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: andere exceptie dan APPS-TRANSP-GLS-Exceptions-CommunicatieException wordt toch gesmeten">
+<Method name="Test: aangepase melding teruggeven indien andere dan APPS-TRANSP-GLS-Exceptions-CommunicatieException gesmeten">
 <Implementation><![CDATA[
 	#Dim ConfirmLoadRequest as WS.AX.Transport.GLS.v01.dto.ConfirmLoadRequest = ..GeefConfirmLoadRequest()
 
@@ -62,11 +62,12 @@
 
 	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)
 	
+	Do $$$AssertEquals(Response.IsGelukt,$$$False)
+	Do $$$AssertEquals(Response.Melding,"Gelieve IT te contacteren : Technische foutmelding","")
 	
-	#Dim Response as WS.AX.Transport.GLS.v01.dto.ConfirmLoadResponse = RegistrationService.ConfirmLoad(ConfirmLoadRequest)
+	Do ConfirmLoadRequestConvertorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad.cls.xml
===================================================================
diff -u -r41767 -r42209
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad.cls.xml	(.../ConfirmLoad.cls.xml)	(revision 41767)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/ConfirmLoad.cls.xml	(.../ConfirmLoad.cls.xml)	(revision 42209)
@@ -40,12 +40,14 @@
 		Set Response.IsGelukt = $$$True
 	} catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+
+		Set Response = ##class(WS.AX.Transport.GLS.v01.dto.RegisterContainerResponse).%New()
+		Set Response.IsGelukt = $$$False
+
 		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()			
 		} else {
-			Do ##class(TECH.ExceptionHandler).Rethrow(Exception)
+			Set Response.Melding =  "Gelieve IT te contacteren : "_ Exception.GeefOmschrijving()			
 		}	
 	}
 	Quit Response
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/ReprintContainer.cls.xml
===================================================================
diff -u -r41763 -r42209
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/ReprintContainer.cls.xml	(.../ReprintContainer.cls.xml)	(revision 41763)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/ReprintContainer.cls.xml	(.../ReprintContainer.cls.xml)	(revision 42209)
@@ -31,25 +31,33 @@
 <ReturnType>WS.AX.Transport.GLS.v01.dto.ReprintContainerResponse</ReturnType>
 <Implementation><![CDATA[
 	Set Response = ##class(WS.AX.Transport.GLS.v01.dto.ReprintContainerResponse).%New()
-	Set Response.IsGelukt = $$$True
-	if ..VerzendDataRepository.BestaatViaUnitID(ReprintContainerRequest.GLSUnitNumber) {
-		#Dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
-		Set VerzendData = ..VerzendDataRepository.GeefViaUnitID(ReprintContainerRequest.GLSUnitNumber)
-		if VerzendData.LaatsteRequestType = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.RequestType).Registratie() {
-			if VerzendData.Status = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.Status).Finished(){
-				Do ..EtiketPrinter.PrintEtiketOpDevice(VerzendData.Response,ReprintContainerRequest.LabelPrinterId)
+
+	try {
+		Set Response.IsGelukt = $$$True
+		if ..VerzendDataRepository.BestaatViaUnitID(ReprintContainerRequest.GLSUnitNumber) {
+			#Dim VerzendData as APPS.TRANSP.GLS.GLSv1.data.VerzendData
+			Set VerzendData = ..VerzendDataRepository.GeefViaUnitID(ReprintContainerRequest.GLSUnitNumber)
+			if VerzendData.LaatsteRequestType = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.RequestType).Registratie() {
+				if VerzendData.Status = ##class(APPS.TRANSP.GLS.GLSv1.Bericht.enu.Status).Finished(){
+					Do ..EtiketPrinter.PrintEtiketOpDevice(VerzendData.Response,ReprintContainerRequest.LabelPrinterId)
+				} else {
+					Set Response.IsGelukt = $$$False
+					Set Response.Melding = "Verzending laatste bericht voor GLS Unit '"_ ReprintContainerRequest.GLSUnitNumber_"' is niet gelukt."
+				}
 			} else {
 				Set Response.IsGelukt = $$$False
-				Set Response.Melding = "Verzending laatste bericht voor GLS Unit '"_ ReprintContainerRequest.GLSUnitNumber_"' is niet gelukt."
-			}
+				Set Response.Melding = "Laatste bericht voor GLS Unit '"_ ReprintContainerRequest.GLSUnitNumber_"' was geen registratie."
+			}		
 		} else {
 			Set Response.IsGelukt = $$$False
-			Set Response.Melding = "Laatste bericht voor GLS Unit '"_ ReprintContainerRequest.GLSUnitNumber_"' was geen registratie."
-		}		
-	} else {
+			Set Response.Melding = "Geen gegevens gevonden voor GLS Unit '"_ ReprintContainerRequest.GLSUnitNumber_"'."
+		}	
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
 		Set Response.IsGelukt = $$$False
-		Set Response.Melding = "Geen gegevens gevonden voor GLS Unit '"_ ReprintContainerRequest.GLSUnitNumber_"'."
-	}
+		Set Response.Melding = "Gelieve IT te contacteren : " _ Exception.GeefOmschrijving()
+	}	
+
 	quit Response
 ]]></Implementation>
 </Method>
Index: WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer.cls.xml
===================================================================
diff -u -r41767 -r42209
--- WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer.cls.xml	(.../CancelContainer.cls.xml)	(revision 41767)
+++ WSimpl/AX/Transport/GLS/v01/RegistrationService/CancelContainer.cls.xml	(.../CancelContainer.cls.xml)	(revision 42209)
@@ -60,7 +60,9 @@
 		} 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)
+			Set Response = ##class(WS.AX.Transport.GLS.v01.dto.CancelContainerResponse).%New()
+			Set Response.IsGelukt = $$$False
+			Set Response.Melding = "Gelieve IT te contacteren : " _ Exceptie.GeefOmschrijving()
 		}		
 	}
 	Quit Response