Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.109
diff -u -r1.109 help-fns.el
--- help-fns.el	10 Nov 2007 09:58:35 -0000	1.109
+++ help-fns.el	22 Nov 2007 03:17:22 -0000
@@ -250,7 +250,7 @@
 
 ;;;###autoload
 (defun describe-function-1 (function)
-  (let* ((advised (and (featurep 'advice) (ad-get-advice-info function)))
+  (let* ((advised (and (featurep 'advice) (ignore-errors (ad-get-advice-info function))))
 	 ;; If the function is advised, use the symbol that has the
 	 ;; real definition, if that symbol is already set up.
 	 (real-function