Index: APPS/TRANSP/GLS/Bericht/impl/VerpakkingEenheidVisitorDtoMaker.cls.xml
===================================================================
diff -u -r29575 -r29627
--- APPS/TRANSP/GLS/Bericht/impl/VerpakkingEenheidVisitorDtoMaker.cls.xml	(.../VerpakkingEenheidVisitorDtoMaker.cls.xml)	(revision 29575)
+++ APPS/TRANSP/GLS/Bericht/impl/VerpakkingEenheidVisitorDtoMaker.cls.xml	(.../VerpakkingEenheidVisitorDtoMaker.cls.xml)	(revision 29627)
@@ -30,7 +30,7 @@
 <Implementation><![CDATA[
 	Do VerpakkingEenheid.Accept($this)
 	
-	#Dim Validator As APPS.TRANSP.GLS.impl.Validator = ##class(APPS.TRANSP.GLS.impl.Validator).%New()
+	#Dim Validator As APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator = ##class(APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator).%New()
 	Do Validator.ValideerAfzenderReferentie(..Request.T854)
 ]]></Implementation>
 </Method>
Index: APPS/TRANSP/GLS/impl/CatchAndLogErrorValidator.cls.xml
===================================================================
diff -u
--- APPS/TRANSP/GLS/impl/CatchAndLogErrorValidator.cls.xml	(revision 0)
+++ APPS/TRANSP/GLS/impl/CatchAndLogErrorValidator.cls.xml	(revision 29627)
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator">
+<Super>APPS.TRANSP.GLS.impl.Validator</Super>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Logger:vhLib.Logger=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..Logger = Logger
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="ValideerAfzenderReferentie">
+<FormalSpec>AfzenderReferentie:TECH.String</FormalSpec>
+<Implementation><![CDATA[
+	Try {
+		Do:(AfzenderReferentie = "") ..ThrowException("De afzender referentie is vereist.")
+		Do:($$$Not(AfzenderReferentie ? 5N1"X"6N1.3A)) ..ThrowException("Het formaat van de afzender referentie '" _ AfzenderReferentie _ "' is foutief.")
+	} Catch {
+		#Dim Exception As TECH.Exceptions.InvalidInputException = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.InvalidInputException")
+		#Dim Detail As TECH.String = "Exceptie: " _ Exception.GeefOmschrijving()
+		
+		Do ..Logger.WarningMail("Validatie AfzenderReferentie", Detail)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="LoggerGet">
+<Private>1</Private>
+<ReturnType>vhLib.Logger</ReturnType>
+<Implementation><![CDATA[	quit $$$LazyLoad(r%Logger,##class(vhLib.Logger).%New())
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/APPS/TRANSP/GLS/impl/CatchAndLogErrorValidator/ValideerAfzenderReferentie/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/APPS/TRANSP/GLS/impl/CatchAndLogErrorValidator/ValideerAfzenderReferentie/Test.cls.xml	(revision 0)
+++ vhUnitTest/APPS/TRANSP/GLS/impl/CatchAndLogErrorValidator/ValideerAfzenderReferentie/Test.cls.xml	(revision 29627)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator.ValideerAfzenderReferentie.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Property name="LoggerMock">
+<Type>vhTest.Mock.vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="OnBeforeOneTest">
+<FormalSpec>aTestName:%String</FormalSpec>
+<Implementation><![CDATA[
+	Do ##super(aTestName)
+	
+	Set ..LoggerMock = ##class(vhTest.Mock.vhLib.Logger).%New()
+]]></Implementation>
+</Method>
+
+<Method name="Test error wordt opgevangen en gemaild bij ongeldige AfzenderReferentie">
+<Implementation><![CDATA[
+	#Dim AfzenderReferentie As TECH.String = "abcdeX123456ABC"
+	#Dim Detail As TECH.String = "Exceptie: Het formaat van de afzender referentie '" _ AfzenderReferentie _ "' is foutief."
+	
+	Do ..LoggerMock.VerwachtMethodCall("WarningMail", "Validatie AfzenderReferentie", Detail).DanDoeNiks()
+	#Dim Validator As APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator = ##class(APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator).%New(..LoggerMock)
+
+	Do $$$AssertTrue(Validator.IsGeldigAfzenderReferentie(AfzenderReferentie))
+	Do ..LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test met geldige AfzenderReferentie">
+<Implementation><![CDATA[
+	Do ..LoggerMock.VerwachtMethodCall("WarningMail", $$$ElkeWaarde).DanDoeNiks().ExactAantalKeer(0)
+	#Dim Validator As APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator = ##class(APPS.TRANSP.GLS.impl.CatchAndLogErrorValidator).%New(..LoggerMock)
+
+	Do $$$AssertTrue(Validator.IsGeldigAfzenderReferentie("12345X123456ABC"))
+	Do ..LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>