diff --git a/compiler/scandir.pas b/compiler/scandir.pas
index c1ffbe1393..f4d9c2f3fb 100644
--- a/compiler/scandir.pas
+++ b/compiler/scandir.pas
@@ -1204,24 +1204,26 @@ unit scandir;
 
     begin
       if switchesstatestackpos < 1 then
-        Message(scan_e_too_many_pop);
-
-      Dec(switchesstatestackpos);
-      recordpendinglocalfullswitch(switchesstatestack[switchesstatestackpos].localsw);
-      recordpendingverbosityfullswitch(switchesstatestack[switchesstatestackpos].verbosity);
-      recordpendingalignmentfullswitch(switchesstatestack[switchesstatestackpos].alignment);
-      recordpendingpackenum(switchesstatestack[switchesstatestackpos].packenum);
-      recordpendingpackrecords(switchesstatestack[switchesstatestackpos].packrecords);
-      recordpendingsetalloc(switchesstatestack[switchesstatestackpos].setalloc);
-      pendingstate.nextmessagerecord:=switchesstatestack[switchesstatestackpos].pmessage;
-      { Reset verbosity and forget previous pmeesage }
-      RestoreLocalVerbosity(nil);
-      current_settings.pmessage:=nil;
-      { Do not yet activate these changes, as otherwise
-        you get problem idf you put a $pop just right after
-        a addition for instance fro which you explicitly truned the overflow check
-        out by using $Q- after a $push PM 2012-08-29 }
-      // flushpendingswitchesstate;
+        Message(scan_e_too_many_pop)
+      else
+        begin
+          Dec(switchesstatestackpos);
+          recordpendinglocalfullswitch(switchesstatestack[switchesstatestackpos].localsw);
+          recordpendingverbosityfullswitch(switchesstatestack[switchesstatestackpos].verbosity);
+          recordpendingalignmentfullswitch(switchesstatestack[switchesstatestackpos].alignment);
+          recordpendingpackenum(switchesstatestack[switchesstatestackpos].packenum);
+          recordpendingpackrecords(switchesstatestack[switchesstatestackpos].packrecords);
+          recordpendingsetalloc(switchesstatestack[switchesstatestackpos].setalloc);
+          pendingstate.nextmessagerecord:=switchesstatestack[switchesstatestackpos].pmessage;
+          { Reset verbosity and forget previous pmeesage }
+          RestoreLocalVerbosity(nil);
+          current_settings.pmessage:=nil;
+          { Do not yet activate these changes, as otherwise
+            you get problem idf you put a $pop just right after
+            a addition for instance fro which you explicitly truned the overflow check
+            out by using $Q- after a $push PM 2012-08-29 }
+          // flushpendingswitchesstate;
+        end;
     end;
 
     procedure dir_pointermath;
diff --git a/tests/webtbf/tw39652.pp b/tests/webtbf/tw39652.pp
new file mode 100644
index 0000000000..137b5ebdfa
--- /dev/null
+++ b/tests/webtbf/tw39652.pp
@@ -0,0 +1,7 @@
+{ %fail }
+program onepoptoomanycrash;
+  {$PUSH}
+  {$POP}
+  {$POP}
+begin
+end.