--- a/Object.st	Fri Mar 08 20:41:41 1996 +0100
+++ b/Object.st	Fri Mar 08 21:29:48 1996 +0100
@@ -1834,9 +1834,8 @@
 
         Smalltalk isStandAloneApp ifTrue:[
             Dialog notNil ifTrue:[
-                Dialog autoload.        "in case its autoloaded"
                 (Dialog confirm:msg yesLabel:'ignore' noLabel:'exit') ifTrue:[
-                    ^ self
+                    ^ AbortSignal raise
                 ]
             ].
             msg errorPrintNL.
@@ -4364,6 +4363,6 @@
 !Object class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.101 1996-03-08 19:41:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.102 1996-03-08 20:29:08 cg Exp $'
 ! !
 Object initialize!

--- a/Smalltalk.st	Fri Mar 08 20:41:41 1996 +0100
+++ b/Smalltalk.st	Fri Mar 08 21:29:48 1996 +0100
@@ -2483,7 +2483,9 @@
                             oldAbbrev := abbrevs at:key ifAbsent:nil.
                             oldAbbrev notNil ifTrue:[
                                 oldAbbrev ~= abbrev ifTrue:[
-                                    ('SMALLTALK: conflict for: ' , nm , ' in abbrev.stc (' , oldAbbrev , ' <-> ' , abbrev , ')') errorPrintNL
+				    StandAlone ifFalse:[
+                                        ('SMALLTALK: conflict for: ' , nm , ' in abbrev.stc (' , oldAbbrev , ' <-> ' , abbrev , ')') errorPrintNL
+				    ]
                                 ].
                             ] ifFalse:[
                                 abbrevs at:nm asSymbol put:abbrev.
@@ -2883,5 +2885,5 @@
 !Smalltalk class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.127 1996-03-06 10:57:35 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Smalltalk.st,v 1.128 1996-03-08 20:29:48 cg Exp $'
 ! !