Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r61563 -r61564
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61563)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 61564)
@@ -318,6 +318,12 @@
 		} Else {
 			Set DnaCode = DnaCodeIterator.Next()
 			If ..IsValid(DnaCodeAfmeldenRequest, .Response, DnaCode) {
+				If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
+					If $$$Not(..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCode, DnaCodeAfmeldenRequest.PalletCode, DnaCodeAfmeldenRequest.BatchId)) {
+						Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("De lade moet in een andere Vhosskast"))
+					}
+				}
+				
 				If DnaCodeAfmeldenRequest.Aantal = -1 {
 					Set DnaCode.InitialenScanner = ""
 					Set DnaCode.ScanTijdstip = ""
@@ -338,17 +344,8 @@
 				Do ..DnaCodeRepository.Bewaar(DnaCode)
 				
 				If ..IsGeldigeVhossCode(DnaCodeAfmeldenRequest.PalletCode) {
-					If ..DnaCodeInVhossKastBepaler.MagDnaCodeInVhossKast(DnaCode, DnaCodeAfmeldenRequest.PalletCode, DnaCodeAfmeldenRequest.GuiVhossVolgnummer) {
-						Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode,)
-						Do ##class(Tools.Wlip).%New(127).ObjToXML(Response)
-						Set Response.Header.Status = "200"
-					} Else {
-						Set DnaCode.InitialenScanner = ""
-						Set DnaCode.ScanTijdstip = ""
-						Set DnaCode.PalletCode = ""
-						Set DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).InBatch()
-						Do ..DnaCodeRepository.Bewaar(DnaCode)
-					}
+					Set Response = ..AantalGescandeVhossSequentieItemsBepaler.BepaalAantalGescandeVhossSequentieItems(DnaCode)
+					Set Response.Header.Status = "200"
 				} Else {
 					Set ToeleveringId = DnaCode.Toelevering
 					Set DnaCodeIterator = ..DnaCodeRepository.ZoekViaToeleveringIdEnRecent(ToeleveringId)