--- a/Smalltalk.st	Wed Nov 23 16:02:12 2016 +0100
+++ b/Smalltalk.st	Wed Nov 23 17:31:01 2016 +0100
@@ -4384,6 +4384,11 @@
 
     keepSplashWindow := StartupClass perform:#keepSplashWindowOpen ifNotUnderstood:[false].
 
+    idx := CommandLineArguments indexOf:'--debug'.
+    (idx ~~ 0) ifTrue:[
+        CommandLineArguments removeAtIndex:idx.    
+    ].    
+
     "
      while reading patches- and rc-file, do not add things into change-file
     "
@@ -4483,6 +4488,8 @@
                                     ex suspendedContext fullPrintAll.
                                 ].
                                 self exit:1.
+                            ] ifFalse:[
+                                MiniDebugger enter.
                             ].
                             self exit:1.
                             "/ ex reject.
@@ -4641,6 +4648,8 @@
                                     ex suspendedContext fullPrintAll.
                                 ].
                                 self exit:1.
+                            ] ifFalse:[
+                                MiniDebugger enter.
                             ].
                             self exit:1.
                             "/ ex reject.