--- a/BlockContext.st	Tue Nov 08 11:34:56 2016 +0100
+++ b/BlockContext.st	Tue Nov 08 11:42:02 2016 +0100
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 1993 by Claus Gittinger
 	      All Rights Reserved
@@ -197,7 +195,18 @@
             aStream nextPutAll:'[] (optimized) in ???'.
         ] ifFalse:[
             aStream nextPutAll:'[] in '.
-            m mclass name printOn:aStream.
+            cls := m mclass.
+            cls isNil ifTrue:[
+                cls := m getMclass.
+                cls isNil ifTrue:[
+                    className := '*Unbound*'
+                ] ifFalse:[
+                    className := '(previously in) ',cls name
+                ].    
+            ] ifFalse:[
+                className := cls name.
+            ].
+            className printOn:aStream. 
             aStream nextPutAll:'>>'.
             m selector printOn:aStream.
         ].
@@ -265,10 +274,10 @@
 !BlockContext class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/BlockContext.st,v 1.40 2015-06-05 16:08:35 stefan Exp $'
+    ^ '$Header$'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/BlockContext.st,v 1.40 2015-06-05 16:08:35 stefan Exp $'
+    ^ '$Header$'
 ! !