Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r68 -r76
--- AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 68)
+++ AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 76)
@@ -29,14 +29,14 @@
 implementation
 
 uses
-  DnaCodeService;
+  DnaCodeService, UiContext;
 
 {$R *.dfm}
 
 procedure TfmPalletScherm.actHomeExecute(Sender: TObject);
 begin
   inherited;
-  //
+  Self.ModalResult := mrHome;
 end;
 
 procedure TfmPalletScherm.actVolgendeExecute(Sender: TObject);
@@ -47,7 +47,9 @@
   Header: RequestHeader;
   fZoekViaPalletCodeRequest: ZoekViaPalletCodeRequest;
   fZoekViaPalletCodeResponse: ZoekViaPalletCodeResponse;
+  fPalletGevalideerd: boolean;
 begin
+  fPalletGevalideerd := false;
   Service := DnaCodeService.GetDnaCodeServiceSoap();
 
   // pallet code valideren
@@ -62,12 +64,12 @@
     fValideerPalletCodeResponse := Service.ValideerPalletCode(fValideerPalletCodeRequest);
     try
       if fValideerPalletCodeResponse.Header.Status <> '200' then begin
-        Self.ModalResult := mrRetry;
+        Self.ModalResult := mrPallet;
         ToonPopupScherm(fValideerPalletCodeResponse.Header.Omschrijving, 'Scan opnieuw');
         edtPallet.Text := '';
         SetContext;
       end else begin
-        Self.ModalResult := mrOk;
+        fPalletGevalideerd := true;
       end;
     finally
       fValideerPalletCodeResponse.Free;
@@ -77,7 +79,7 @@
   end;
 
   //checken of pallet in gebruik is indien het vorige geslaagd is
-  if Self.ModalResult = mrOk then begin
+  if fPalletGevalideerd then begin
     fZoekViaPalletCodeRequest := ZoekViaPalletCodeRequest.Create;
     Header := RequestHeader.Create;
     try
@@ -89,16 +91,19 @@
       fZoekViaPalletCodeResponse := Service.ZoekViaPalletCode(fZoekViaPalletCodeRequest);
       try
         if fZoekViaPalletCodeResponse.Header.Status = '200' then
-          Self.ModalResult := mrNo
+          Self.ModalResult := mrBestaandePallet
         else
-          Self.ModalResult := mrOk;
+          Self.ModalResult := mrDnaCode;
       finally
         fZoekViaPalletCodeResponse.Free;
       end;
     finally
       fZoekViaPalletCodeRequest.Free;
     end;
 
+  end else begin
+    ToonPopupScherm('Pallet kon niet gevalideerd worden', 'Scan opnieuw');
+    Self.ModalResult := mrPallet;
   end;
 
 end;
Index: AAPClient/UI/UiContext.pas
===================================================================
diff -u -r75 -r76
--- AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 75)
+++ AAPClient/UI/UiContext.pas	(.../UiContext.pas)	(revision 76)
@@ -3,9 +3,11 @@
 interface
 
 const
-  mrLogin  = 101;
-  mrHome   = 102;
-  mrPallet = 103;
+  mrLogin           = 101;
+  mrHome            = 102;
+  mrPallet          = 103;
+  mrBestaandePallet = 104;
+  mrDnaCode         = 105;
 
 type
   TUiContext = class
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r75 -r76
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 75)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 76)
@@ -84,7 +84,7 @@
 
     //HomeScherm tonen
     if fHuidigScherm.ClassType = TfmHomeScherm then begin
-      if fHuidigScherm.ModalResult = mrYes then begin
+      if fHuidigScherm.ModalResult = mrPallet then begin
         fHuidigScherm := fPalletScherm;
       end
       else if fHuidigScherm.ModalResult = mrNo then begin
@@ -99,16 +99,16 @@
 
     //PalletScherm tonen
     if fHuidigScherm.ClassType = TfmPalletScherm then begin
-      if fHuidigScherm.ModalResult = mrYes then begin
+      if fHuidigScherm.ModalResult = mrHome then begin
         fHuidigScherm := fHomeScherm;
       end
-      else if fHuidigScherm.ModalResult = mrRetry then begin
+      else if fHuidigScherm.ModalResult = mrPallet then begin
         fHuidigScherm := fPalletScherm;
       end
-      else if fHuidigScherm.ModalResult = mrNo then begin
+      else if fHuidigScherm.ModalResult = mrBestaandePallet then begin
         fHuidigScherm := fBestaandePalletScherm;
       end
-      else if fHuidigScherm.ModalResult = mrOk then begin
+      else if fHuidigScherm.ModalResult = mrDnaCode then begin
         fHuidigScherm := fDnaCodeScherm;
       end
       else if fHuidigScherm.ModalResult = mrAbort then begin