Index: AAPClient/UI/DnaCodeScherm.pas
===================================================================
diff -u -r188 -r189
--- AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 188)
+++ AAPClient/UI/DnaCodeScherm.pas	(.../DnaCodeScherm.pas)	(revision 189)
@@ -199,11 +199,13 @@
   lblAantalGescand.Caption := '';
   lblTotaalAantal.Caption := '';
   imgInfo.Visible := false;
-  imgGls.Visible := false;
-  imgWegwerpPallet.Visible := false;
   fImagesScherm.ilAlgemeen64.GetIcon(1, imgInfo.Picture.Icon);
   if not (UiContext.Toelevering = '') then
-    ToeleveringDataOphalen();
+    ToeleveringDataOphalen()
+  else begin
+    imgGls.Visible := false;
+    imgWegwerpPallet.Visible := false;
+  end;
 
   inherited;
 end;
@@ -310,15 +312,22 @@
 
 procedure TfmDnaCodeScherm.VerwerkMogelijkePopups(EersteDnaCode: DnaCode);
 begin
-  if EersteDnaCode.IsGlsDirect and not imgGls.Visible then begin
-    ToonPopupScherm('GLS Direct', 'OK','',15,-1,-1,clBlue);
+  if EersteDnaCode.IsGlsDirect then begin
+    if not imgGls.Visible then
+      ToonPopupScherm('GLS Direct', 'OK','',15,-1,-1,clBlue);
     fImagesScherm.ilAlgemeen32.GetIcon(3, imgGls.Picture.Icon);
     imgGls.Visible := EersteDnaCode.IsGlsDirect;
+  end else begin
+    imgGls.Visible := false;
   end;
-  if EersteDnaCode.IsWegwerpPallet and not imgWegwerpPallet.Visible then begin
-    ToonPopupScherm('Wegwerppallet', 'OK','',16,-1,-1,clYellow);
+
+  if EersteDnaCode.IsWegwerpPallet then begin
+    if not imgWegwerpPallet.Visible then
+      ToonPopupScherm('Wegwerppallet', 'OK','',16,-1,-1,clYellow);
     fImagesScherm.ilAlgemeen32.GetIcon(4, imgWegwerpPallet.Picture.Icon);
     imgWegwerpPallet.Visible := EersteDnaCode.IsWegwerpPallet;
+  end else begin
+    imgWegwerpPallet.Visible := false;
   end;
 end;