Index: /trunk/ccl/level-1/l1-clos-boot.lisp
===================================================================
--- /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 5944)
+++ /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 5945)
@@ -3009,6 +3009,9 @@
   (let ((wrapper (standard-object-p instance)))
     (unless wrapper
-      (when (standard-generic-function-p instance)
-        (setq wrapper (generic-function-wrapper instance)))
+      (if (standard-generic-function-p instance)
+        (setq wrapper (generic-function-wrapper instance))
+        (when (typep instance 'funcallable-standard-object)
+          (setq wrapper (gf.instance.class-wrapper instance))))
+      
       (unless wrapper
         (report-bad-arg instance '(or standard-object standard-generic-function))))