--- a/Tools__BreakpointService.st	Wed Nov 16 17:19:12 2016 +0100
+++ b/Tools__BreakpointService.st	Wed Nov 16 20:18:06 2016 +0100
@@ -134,6 +134,9 @@
     codeView method isNil ifTrue:[
         ^ self
     ].
+    currentMethod isNil ifTrue:[   
+        ^ self
+    ].
 
     textView reallyModified ifTrue:[
         "/ leads to ugly behavior (method no longer found), if we allow
@@ -228,8 +231,8 @@
     ].
 
     "Created: / 17-06-2011 / 13:45:22 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 28-08-2013 / 14:45:36 / cg"
     "Modified: / 21-02-2014 / 17:36:11 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 16-11-2016 / 18:49:05 / cg"
 ! !
 
 !BreakpointService methodsFor:'change & update'!