--- a/Object.st	Tue Apr 30 10:54:00 2013 +0100
+++ b/Object.st	Tue May 21 21:58:09 2013 +0100
@@ -15,12 +15,12 @@
 	instanceVariableNames:''
 	classVariableNames:'ErrorSignal HaltSignal MessageNotUnderstoodSignal
 		UserInterruptSignal RecursionInterruptSignal
-		ExceptionInterruptSignal SubscriptOutOfBoundsSignal
-		IndexNotFoundSignal NonIntegerIndexSignal NotFoundSignal
-		KeyNotFoundSignal ElementOutOfBoundsSignal UserNotificationSignal
-		InformationSignal WarningSignal PrimitiveFailureSignal
-		DeepCopyErrorSignal AbortSignal ErrorRecursion Dependencies
-		InfoPrinting ActivityNotificationSignal InternalErrorSignal
+		SubscriptOutOfBoundsSignal IndexNotFoundSignal
+		NonIntegerIndexSignal NotFoundSignal KeyNotFoundSignal
+		ElementOutOfBoundsSignal UserNotificationSignal InformationSignal
+		WarningSignal PrimitiveFailureSignal DeepCopyErrorSignal
+		AbortSignal ErrorRecursion Dependencies InfoPrinting
+		ActivityNotificationSignal InternalErrorSignal
 		NonWeakDependencies SynchronizationSemaphores ObjectAttributes
 		OSSignalInterruptSignal FinalizationLobby
 		RecursiveStoreStringSignal AbortAllSignal EnabledBreakPoints'
@@ -221,7 +221,8 @@
     "called only once - initialize signals"
 
     ErrorSignal isNil ifTrue:[
-        self initSignals
+        self initSignals.
+        ErrorRecursion := true.
     ].
 
     ObjectAttributes isNil ifTrue:[
@@ -670,6 +671,7 @@
 ! !
 
 
+
 !Object methodsFor:'accessing'!
 
 _at:index
@@ -2814,8 +2816,8 @@
         AssertionFailedError
             raiseRequestWith:self
             errorString:('Assertion failed in ',
-                         thisContext sender printString,
-                         '[', thisContext sender lineNumber printString,']')
+                         thisContext methodHome sender printString,
+                         '[', thisContext  methodHome sender lineNumber printString,']')
     ].
 
     "
@@ -2838,7 +2840,7 @@
     (aBooleanOrBlock value) ifFalse:[
         AssertionFailedError
             raiseRequestWith:self
-            errorString:(messageIfFailing, ' {',thisContext sender "methodHome" printString,' }')
+            errorString:(messageIfFailing, ' {',thisContext methodHome sender "methodHome" printString,' }')
     ].
 
     "
@@ -9417,7 +9419,8 @@
 
     Smalltalk isInitialized ifFalse:[
         'errorNotification: ' print. aString printCR.
-        aContext sender printAllLevels:10.
+        con := aContext ? thisContext methodHome.
+        con sender printAllLevels:10.
         ^ nil
     ].
 
@@ -9461,7 +9464,7 @@
         ] do:[ |s|
             sender := aContext.
             sender isNil ifTrue:[
-                sender := thisContext sender.
+                sender := thisContext methodHome sender.
             ].
             con := sender.
 
@@ -9650,11 +9653,11 @@
 !Object class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.718 2013-04-27 13:07:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.720 2013-05-07 14:04:27 stefan Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.718 2013-04-27 13:07:08 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Object.st,v 1.720 2013-05-07 14:04:27 stefan Exp $'
 !
 
 version_SVN