Index: AAPClient/UI/HernoemPalletScherm.pas
===================================================================
diff -u -r154 -r155
--- AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 154)
+++ AAPClient/UI/HernoemPalletScherm.pas	(.../HernoemPalletScherm.pas)	(revision 155)
@@ -142,8 +142,13 @@
       if Response.Header.Status <> '200' then begin
         ToonPopupScherm(Response.Header.Omschrijving, 'Probeer opnieuw','')
       end else begin
-        VulGridMetToeleveringData(Response.DnaCodes);
-        pcHernoemPallet.ActivePageIndex := 1;
+        if NieuweCode = '' then begin
+          VulGridMetToeleveringData(Response.DnaCodes);
+          pcHernoemPallet.ActivePageIndex := 1;
+        end else begin
+          ToonPopupScherm(Response.Header.Omschrijving, 'OK','');
+          Self.ModalResult := mrHome;
+        end;
       end;
     finally
       result := Response;
@@ -152,6 +157,8 @@
   finally
     Request.Free;
   end;
+  if Self.ModalResult = mrHome then
+    CloseModal;
 end;
 
 procedure TfmHernoemPalletScherm.FormCreate(Sender: TObject);
@@ -164,6 +171,7 @@
 begin
   btnCentraalOnder.Action := actHome;
   btnRechtsOnder.Action := actVolgende;
+  pcHernoemPallet.ActivePageIndex := 0;
   inherited;
 end;