--- a/WrappedMethod.st	Wed Aug 28 10:49:44 2013 +0100
+++ b/WrappedMethod.st	Wed Sep 04 09:44:03 2013 +0100
@@ -53,7 +53,7 @@
 !WrappedMethod class methodsFor:'others'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic3/WrappedMethod.st,v 1.36 2013-08-02 09:02:32 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic3/WrappedMethod.st,v 1.37 2013-08-29 09:52:14 cg Exp $'
 !
 
 version_HG
@@ -207,7 +207,9 @@
 !
 
 programmingLanguage
-    ^ self originalMethod programmingLanguage
+    ^ (self originalMethod ? self mclass ? Smalltalk) programmingLanguage
+
+    "Modified: / 29-08-2013 / 10:59:20 / cg"
 !
 
 replaceOriginalMethodWith:aNewMethod
@@ -374,7 +376,12 @@
 !
 
 parse:parseSelector with:arg2 return:accessSelector or:valueIfNoSource
-    ^ self originalMethod parse:parseSelector with:arg2 return:accessSelector or:valueIfNoSource
+    |m|
+
+    (m := self originalMethod) notNil ifTrue:[
+        ^ m parse:parseSelector with:arg2 return:accessSelector or:valueIfNoSource
+    ].
+    ^ valueIfNoSource
 
     "Created: / 02-08-2013 / 10:57:02 / cg"
 !
@@ -408,6 +415,6 @@
 !
 
 version_SVN
-    ^ '$Id: WrappedMethod.st,v 1.36 2013-08-02 09:02:32 cg Exp $'
+    ^ '$Id: WrappedMethod.st,v 1.37 2013-08-29 09:52:14 cg Exp $'
 ! !