Index: /trunk/ccl/level-1/l1-error-system.lisp
===================================================================
--- /trunk/ccl/level-1/l1-error-system.lisp	(revision 831)
+++ /trunk/ccl/level-1/l1-error-system.lisp	(revision 832)
@@ -518,5 +518,8 @@
             ((fixnump fn)               ; restart case
              (throw tag (cons fn values)))
-            (t (apply fn values))))))   ; restart bind
+            ((functionp fn)		; restart bind
+	     (apply fn values))		
+	    (t				; with-simple-restart
+	     (throw tag (values nil t)))))))