--- a/Context.st	Sat Oct 20 22:54:26 2012 +0200
+++ b/Context.st	Mon Oct 22 10:19:29 2012 +0200
@@ -1737,6 +1737,21 @@
         "
         (selector ~~ #doIt and:[selector ~~ #doIt:]) ifTrue:[
             implementorClass := self methodClass.
+            implementorClass isNil ifTrue:[
+                "
+                 kludge for the frame called by a wrappedmethod;
+                 the wrappedmethod is in the class, so its mclass is correct.
+                 however, the originalmethod is invoked via performMethod, and its mclass
+                 is nil. Care for this here. Think about keeping the mclass in the original method.
+                "
+                method isWrapped ifFalse:[
+                    WrappedMethod allInstancesDo:[:wrapped |
+                        wrapped originalMethodIfWrapped == method ifTrue:[
+                            implementorClass := wrapped mclass.
+                        ].
+                    ].
+                ]
+            ].
         ].
 
         implementorClass notNil ifTrue: [
@@ -2451,7 +2466,7 @@
 !Context class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.174 2012-08-05 16:22:41 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/Context.st,v 1.175 2012-10-22 08:19:29 cg Exp $'
 !
 
 version_SVN