1 files changed, 7 insertions, 3 deletions
diff --git a/src/gui/gui_form.pas b/src/gui/gui_form.pas
index e5b802da..f5680e25 100644
--- a/src/gui/gui_form.pas
+++ b/src/gui/gui_form.pas
@@ -240,9 +240,13 @@ begin
   // processing messages until this form ends.
   // delivering the remaining messages
   fpgApplication.ProcessMessages;
-  repeat
-    fpgWaitWindowMessage;
-  until (ModalResult <> 0) or (not Visible);
+  try
+    repeat
+      fpgWaitWindowMessage;
+    until (ModalResult <> 0) or (not Visible);
+  except
+    fpgApplication.HandleException(self);
+  end;
 
   fpgApplication.PopModalForm;
   Result := ModalResult;