Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r55636 -r55639
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 55636)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 55639)
@@ -3,27 +3,53 @@
 <Class name="WSimpl.Halux.AAP.DnaCodeService">
 <Super>TECH.RegisteredObject</Super>
 
+<Property name="HeaderValidator">
+<Type>WSimpl.Halux.AAP.HeaderValidator</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>HeaderValidator:WSimpl.Halux.AAP.HeaderValidator</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..HeaderValidator = $$$Inject(HeaderValidator, ##class(WSimpl.Halux.AAP.HeaderValidator).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="ValideerPalletCode">
 <FormalSpec>ValideerPalletCodeRequest:WS.Halux.AAP.ValideerPalletCodeRequest</FormalSpec>
 <ReturnType>WS.Halux.AAP.ValideerPalletCodeResponse</ReturnType>
 <Implementation><![CDATA[
-	#dim Match As %Boolean = $$$False
 	Set Response = ##class(WS.Halux.AAP.ValideerPalletCodeResponse).%New()
-	
-	#dim PalletCode = ##class(TECH.StringUtils).ToUpper(ValideerPalletCodeRequest.PalletCode)
-	
-	Set:(PalletCode ?1"TBX"5N) Match=$$$True 
-	Set:(PalletCode ?1"DIV"5N) Match=$$$True
-	Set:(PalletCode ?1"KAD"5N) Match=$$$True
-	Set:(PalletCode ?1"SFS"5N) Match=$$$True
-	Set:(PalletCode ?1"TBP"5N) Match=$$$True
-	Set:(PalletCode ?1"VHOSS"3N) Match=$$$True
-	
-	If Match {
-		Set Response.Header.Status = "200"
-	} Else {
-		Set Response.Header.Status = "1005:InvalidUserInput"
-		Set Response.Header.Omschrijving = "Ongeldige code"
+	Try {
+		Do ..HeaderValidator.ValidateHeader(ValideerPalletCodeRequest.Header)
+
+		#dim Match As %Boolean = $$$False
+		
+		#dim PalletCode = ##class(TECH.StringUtils).ToUpper(ValideerPalletCodeRequest.PalletCode)
+		
+		Set:(PalletCode ?1"TBX"5N) Match=$$$True 
+		Set:(PalletCode ?1"DIV"5N) Match=$$$True
+		Set:(PalletCode ?1"KAD"5N) Match=$$$True
+		Set:(PalletCode ?1"SFS"5N) Match=$$$True
+		Set:(PalletCode ?1"TBP"5N) Match=$$$True
+		Set:(PalletCode ?1"VHOSS"3N) Match=$$$True
+		
+		If Match {
+			Set Response.Header.Status = "200"
+		} Else {
+			Set Response.Header.Status = "1005:InvalidUserInput"
+			Set Response.Header.Omschrijving = "Ongeldige code"
+		}
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set Response.Header.Status = Exception.GeefExceptionCode()
+		Set Response.Header.Omschrijving = Exception.GeefOmschrijving()
 	}
 	
 	Quit Response