--- a/Context.st	Thu May 22 18:13:11 2014 +0200
+++ b/Context.st	Thu May 22 18:19:23 2014 +0200
@@ -1811,9 +1811,11 @@
                  is nil. Care for this here. Think about keeping the mclass in the original method.
                 "
                 (method notNil and:[method isWrapped not]) ifTrue:[
-                    WrappedMethod allInstancesDo:[:wrapped |
-                        wrapped originalMethodIfWrapped == method ifTrue:[
-                            implementorClass := wrapped mclass.
+                    WrappedMethod notNil ifTrue:[
+                        WrappedMethod allInstancesDo:[:wrapped |
+                            wrapped originalMethodIfWrapped == method ifTrue:[
+                                implementorClass := wrapped mclass.
+                            ].
                         ].
                     ].
                 ]
@@ -2601,11 +2603,11 @@
 !Context class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.201 2014-05-14 10:09:45 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.202 2014-05-22 16:19:23 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.201 2014-05-14 10:09:45 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.202 2014-05-22 16:19:23 cg Exp $'
 !
 
 version_HG