--- a/NoHandlerError.st	Wed Jul 24 11:26:43 2019 +0200
+++ b/NoHandlerError.st	Wed Jul 24 18:05:41 2019 +0200
@@ -433,17 +433,18 @@
          and:[(ControlInterrupt handles:ex exception)
          and:[(ControlInterrupt ~~ ex exception creator) ]]) ifTrue:[
             "/ go directly into the debugger ...
-            ^ Debugger
+            Debugger
                 enter:ex returnableSuspendedContext
                 withMessage:message
                 mayProceed:ex mayProceed.
-        ].
-        "/ ask, and maybe go into the debugger ...
-        ^ EmergencyHandlerReceiver
-            errorNotify:message
-            from:ex returnableSuspendedContext
-            allowDebug:true
-            mayProceed:ex mayProceed.
+        ] ifFalse:[
+            "/ ask, and maybe go into the debugger ...
+            EmergencyHandlerReceiver
+                errorNotify:message
+                from:ex returnableSuspendedContext
+                allowDebug:true
+                mayProceed:ex mayProceed.
+        ]
       ]
 
     "test with (NOTE: halt, breakpoints or CTRL-C's still go straight into the debugger):
@@ -456,7 +457,7 @@
     "
 
     "Modified: / 16-11-2001 / 16:07:05 / cg"
-    "Modified: / 22-07-2019 / 18:21:29 / Maren"
+    "Modified: / 23-07-2019 / 17:23:05 / Maren"
 !
 
 notifyingEmergencyHandlerForUserProcesses
@@ -486,17 +487,18 @@
             and:[ (ControlInterrupt handles:ex exception)
             and:[ (ControlInterrupt ~~ ex exception creator) ]]) ifTrue:[
                 "/ go directly into the debugger ...
-                ^ Debugger
+                Debugger
                     enter:ex returnableSuspendedContext
                     withMessage:message
                     mayProceed:ex mayProceed.
-            ].
-            "/ ask, and maybe go into the debugger ...
-            ^ EmergencyHandlerReceiver
-                errorNotify:message
-                from:ex returnableSuspendedContext
-                allowDebug:true
-                mayProceed:ex mayProceed.
+            ] ifFalse:[
+                "/ ask, and maybe go into the debugger ...
+                EmergencyHandlerReceiver
+                    errorNotify:message
+                    from:ex returnableSuspendedContext
+                    allowDebug:true
+                    mayProceed:ex mayProceed.
+            ]
         ]
       ]
 
@@ -510,7 +512,7 @@
     "
 
     "Modified: / 16-11-2001 / 16:06:54 / cg"
-    "Modified: / 22-07-2019 / 18:21:22 / Maren"
+    "Modified: / 22-07-2019 / 18:46:05 / Maren"
 ! !
 
 !NoHandlerError methodsFor:'accessing'!