Index: /trunk/ccl/level-1/l1-clos-boot.lisp
===================================================================
--- /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 410)
+++ /trunk/ccl/level-1/l1-clos-boot.lisp	(revision 411)
@@ -1417,7 +1417,5 @@
  ; returns thing's class-wrapper or nil if it isn't a standard-object
   (if (standard-instance-p thing)
-    (let* ((wrapper (instance.class-wrapper thing)))
-      (if (uvectorp wrapper)  ;; ???? - probably ok
-        wrapper))
+    (instance.class-wrapper thing)
     (if (typep thing 'macptr)
       (foreign-instance-class-wrapper thing))))
@@ -3181,8 +3179,14 @@
 
 (defmethod instance-class-wrapper ((instance standard-object))
-  (instance.class-wrapper instance))
+  (if (%standard-instance-p instance)
+    (instance.class-wrapper instance)
+    (if (typep instance 'macptr)
+      (foreign-instance-class-wrapper instance))))
 
 (defmethod instance-class-wrapper ((instance standard-generic-function))
   (gf.instance.class-wrapper  instance))
+
+
+				   
 
 (defun generic-function-wrapper (gf)