--- a/Breakpoint.st	Thu May 14 15:22:51 2015 +0000
+++ b/Breakpoint.st	Mon May 18 16:48:37 2015 +0200
@@ -1,3 +1,5 @@
+"{ Encoding: utf8 }"
+
 "
  COPYRIGHT (c) 2006 by eXept Software AG
               All Rights Reserved
@@ -172,14 +174,24 @@
 
     <resource: #skipInDebuggersWalkBack>
 
-    |sender|
+    |sender mthd where|
 
     description isEnabled ifFalse:[^ self].
     sender := thisContext sender.
     (description shouldBreakIn: sender) ifTrue:[
+        mthd := method.
+        mthd mclass isNil ifTrue:[
+            mthd := sender method.
+        ].
+        mthd notNil ifTrue:[
+            where := mthd whoString
+        ] ifFalse:[
+            where := '?'
+        ].
         BreakPointInterrupt
             raiseRequestWith: self
-            errorString:('Breakpoint encountered at line %1' bindWith:self line)
+            errorString:('Breakpoint encountered at line %1 in %2' 
+                                bindWith:self line with:where)
             "/ in:sender.
     ].
     (description shouldTraceIn: sender) ifTrue:[
@@ -239,11 +251,11 @@
 !Breakpoint class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libcomp/Breakpoint.st,v 1.26 2015-02-16 12:08:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Breakpoint.st,v 1.27 2015-05-18 14:48:37 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libcomp/Breakpoint.st,v 1.26 2015-02-16 12:08:16 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libcomp/Breakpoint.st,v 1.27 2015-05-18 14:48:37 cg Exp $'
 !
 
 version_SVN