--- a/Tools__BreakpointService.st	Sat Aug 24 23:14:04 2013 +0100
+++ b/Tools__BreakpointService.st	Wed Aug 28 10:50:17 2013 +0100
@@ -363,7 +363,7 @@
 !
 
 setOrToggleBreakpointAtLine:line
-    |pos bpnt prepareFullBreakSupport|
+    |pos bpnt prepareFullBreakSupport mClass|
 
     "/ if true, setting a single breakpoint in a method will create
     "/ a whole set of invisible (and disabled) breakpoints in that method,
@@ -435,12 +435,15 @@
         ] ifFalse:[
             bpnt toggle.
         ].
-        currentMethod mclass isNil ifTrue:[
+        (mClass := currentMethod mclass) isNil ifTrue:[
             "/ hack: ouch - was wrapped in the meantime;
             "/ hurry up and update. Should be done elsewhere (in codeView)
             self updateCurrentMethod.
+            mClass := currentMethod mclass.
         ].
-        Smalltalk changed:#methodTrap with:(MethodTrapChangeNotificationParameter changeClass:currentMethod mclass changeSelector:currentMethod selector).
+        mClass notNil ifTrue:[
+            Smalltalk changed:#methodTrap with:(MethodTrapChangeNotificationParameter changeClass:mClass changeSelector:currentMethod selector).
+        ].
     ].
 
     gutterView redrawLine:line.
@@ -537,14 +540,14 @@
 !BreakpointService class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.36 2013-07-24 09:50:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.37 2013-08-23 15:24:50 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.36 2013-07-24 09:50:26 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__BreakpointService.st,v 1.37 2013-08-23 15:24:50 cg Exp $'
 !
 
 version_SVN
-    ^ '$Id: Tools__BreakpointService.st,v 1.36 2013-07-24 09:50:26 cg Exp $'
+    ^ '$Id: Tools__BreakpointService.st,v 1.37 2013-08-23 15:24:50 cg Exp $'
 ! !