Index: WSimpl/Halux/AAP/DnaCodeService.cls.xml
===================================================================
diff -u -r58133 -r58207
--- WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58133)
+++ WSimpl/Halux/AAP/DnaCodeService.cls.xml	(.../DnaCodeService.cls.xml)	(revision 58207)
@@ -388,15 +388,21 @@
 <ReturnType>%Boolean</ReturnType>
 <Implementation><![CDATA[
 	#dim Geslaagd As %Boolean = $$$True
-	If ($$$HasLength(DnaCodeAfmeldenRequest.Toelevering) && $$$Not(DnaCode.Toelevering = DnaCodeAfmeldenRequest.Toelevering)) {
+	If DnaCode.Status = ##class(DOM.Halux.AAP.enu.DnaCodeStatus).Gescand() {
 		Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
-		Set Response.Header.Omschrijving = "Toeleveringen verschillend: '"_DnaCodeAfmeldenRequest.Toelevering_"' en '"_DnaCode.Toelevering_"'"
+		Set Response.Header.Omschrijving = "DnaCode '"_DnaCode.DnaCode_"' reeds gescand ("_DnaCode.PalletCode_")"
 		Set Geslaagd = $$$False
 	} Else {
-		If $$$HasLength(DnaCode.PalletCode) && $$$Not(DnaCodeAfmeldenRequest.Aantal=-1) {
+		If ($$$HasLength(DnaCodeAfmeldenRequest.Toelevering) && $$$Not(DnaCode.Toelevering = DnaCodeAfmeldenRequest.Toelevering)) {
 			Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
-			Set Response.Header.Omschrijving = "PalletCode reeds ingevuld voor '"_DnaCodeAfmeldenRequest.DnaCode_"' ("_DnaCode.PalletCode_")"
+			Set Response.Header.Omschrijving = "Toeleveringen verschillend: '"_DnaCodeAfmeldenRequest.Toelevering_"' en '"_DnaCode.Toelevering_"'"
 			Set Geslaagd = $$$False
+		} Else {
+			If $$$HasLength(DnaCode.PalletCode) && $$$Not(DnaCodeAfmeldenRequest.Aantal=-1) {
+				Set Response.Header.Status = ##class(TECH.enu.ExceptionCode).InvalidInput()
+				Set Response.Header.Omschrijving = "PalletCode reeds ingevuld voor '"_DnaCodeAfmeldenRequest.DnaCode_"' ("_DnaCode.PalletCode_")"
+				Set Geslaagd = $$$False
+			}
 		}
 	}
 	Quit Geslaagd