Index: AAPClient/UI/PalletScherm.pas
===================================================================
diff -u -r44 -r57
--- AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 44)
+++ AAPClient/UI/PalletScherm.pas	(.../PalletScherm.pas)	(revision 57)
@@ -86,9 +86,13 @@
       fZoekViaPalletCodeResponse := Service.ZoekViaPalletCode(fZoekViaPalletCodeRequest);
       try
         if fZoekViaPalletCodeResponse.Header.Status = '200' then begin
-          Self.ModalResult := mrNo;
+          if Length(fZoekViaPalletCodeResponse.DnaCodes) > 0 then begin
+            Self.ModalResult := mrNo;
+          end else begin
+            Self.ModalResult := mrOk;
+          end;
         end else begin
-          Self.ModalResult := mrOk;
+          Self.ModalResult := mrRetry;
         end;
       finally
         fZoekViaPalletCodeResponse.Free;
Index: AAPClient/Win32/Debug/ProScanMain.dcu
===================================================================
diff -u -r55 -r57
Binary files differ
Index: AAPClient/ProScanMain.pas
===================================================================
diff -u -r55 -r57
--- AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 55)
+++ AAPClient/ProScanMain.pas	(.../ProScanMain.pas)	(revision 57)
@@ -47,8 +47,6 @@
 end;
 
 procedure TfmProScanHoofdscherm.FormCreate(Sender: TObject);
-var
-  LoginScherm: TfmLoginScherm;
 begin
   fLoginScherm := TfmLoginScherm.Create(Self);
   fHomeScherm := TfmHomeScherm.Create(Self);
@@ -57,9 +55,7 @@
   fDnaCodeScherm := TfmDnaCodeScherm.Create(Self);
   fInfoLogScherm := TfmInfoLogScherm.Create(Self);
 
-  //fHuidigScherm := fLoginScherm;
-  fHuidigScherm := fInfoLogScherm;
-  fHuidigeToelevering := '333333';
+  fHuidigScherm := fLoginScherm;
 
   Self.Show;
 end;
@@ -150,6 +146,7 @@
     if fHuidigScherm.ClassType = TfmDnaCodeScherm then begin
       (fHuidigScherm as TfmDnaCodeScherm).lblPalletCode.Caption := fHuidigePallet;
       fModalResult := fHuidigScherm.ShowModal;
+      fHuidigeToelevering := (fHuidigScherm as TfmDnaCodeScherm).GeefToelevering();
       if fHuidigScherm.ModalResult = mrYes then begin
         fHuidigScherm := fHomeScherm;
       end
@@ -162,7 +159,6 @@
       else if fHuidigScherm.ModalResult = mrIgnore then begin
         fHuidigScherm := fInfoLogScherm;
       end;
-      fHuidigeToelevering := (fHuidigScherm as TfmDnaCodeScherm).GeefToelevering();
       continue;
     end;
 
Index: AAPClient/Win32/Debug/ProScan.exe
===================================================================
diff -u -r56 -r57
Binary files differ