--- a/MethodWithBreakpoints.st	Wed Jul 23 14:29:06 2014 +0200
+++ b/MethodWithBreakpoints.st	Wed Jul 23 16:13:50 2014 +0200
@@ -85,13 +85,12 @@
 !MethodWithBreakpoints class methodsFor:'queries'!
 
 allBreakpointedMethods
+    |invalidBreakpoints|
+
     BreakpointedMethods isNil ifTrue:[^ #() ].
-    ^ BreakpointedMethods 
-        select:[:m |
-            "/ must double check - as this is a weak set, it gets cleaned up with a delay.
-            m mclass notNil
-        ]
-        as:OrderedCollection
+    invalidBreakpoints := BreakpointedMethods select:[:m | m mclass isNil].
+    invalidBreakpoints do:[:each | BreakpointedMethods remove:each].
+    ^ BreakpointedMethods asOrderedCollection
 ! !
 
 !MethodWithBreakpoints methodsFor:'accessing'!
@@ -168,11 +167,11 @@
 !MethodWithBreakpoints class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/MethodWithBreakpoints.st,v 1.7 2014-06-23 08:58:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/MethodWithBreakpoints.st,v 1.8 2014-07-23 14:13:50 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/MethodWithBreakpoints.st,v 1.7 2014-06-23 08:58:44 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/MethodWithBreakpoints.st,v 1.8 2014-07-23 14:13:50 cg Exp $'
 ! !