Index: APPS/TRANSP/GLS/impl/Validator.cls.xml
===================================================================
diff -u -r29513 -r29575
--- APPS/TRANSP/GLS/impl/Validator.cls.xml	(.../Validator.cls.xml)	(revision 29513)
+++ APPS/TRANSP/GLS/impl/Validator.cls.xml	(.../Validator.cls.xml)	(revision 29575)
@@ -3,14 +3,28 @@
 <Class name="APPS.TRANSP.GLS.impl.Validator">
 <Super>TECH.RegisteredObject</Super>
 
-<Method name="ValideerAfzenderReferentie">
+<Method name="IsGeldigAfzenderReferentie">
 <FormalSpec>AfzenderReferentie:TECH.String</FormalSpec>
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
-	Do:(AfzenderReferentie = "") ..ThrowException("De afzender referentie is vereist.")
-	Do:($$$Not(AfzenderReferentie ? 5N1"X"6N2.3A)) ..ThrowException("Het formaat van de afzender referentie is foutief.")
+	#Dim IsGeldig As %Boolean = $$$True
+	
+	Try {
+		Do ..ValideerAfzenderReferentie(AfzenderReferentie)
+	} Catch {
+		#Dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(..E.InvalidInputException)
+		Set IsGeldig = $$$False
+	}	
+	
+	Quit IsGeldig
+]]></Implementation>
+</Method>
 
-	Quit $$$True
+<Method name="ValideerAfzenderReferentie">
+<FormalSpec>AfzenderReferentie:TECH.String</FormalSpec>
+<Implementation><![CDATA[
+	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.")
 ]]></Implementation>
 </Method>