diff --git a/pcl/cmucl-documentation.lisp b/pcl/cmucl-documentation.lisp
index bfa2e88e42d6fea5ac339abebce28b4e4997dab3..f2021b87b159552e1b64607d7c659a7ef3ae3a78 100644
--- a/pcl/cmucl-documentation.lisp
+++ b/pcl/cmucl-documentation.lisp
@@ -4,7 +4,7 @@
 ;;; the public domain, and is provided 'as is'.
 
 (file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.17 2010/03/19 15:19:03 rtoy Rel $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/cmucl-documentation.lisp,v 1.18 2010/12/14 21:22:27 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -222,7 +222,7 @@
 	`(defmethod documentation :around ((x t) (doc-type (eql ',dt)))
 	   (let ((doc (call-next-method))
 		 (domain (info ,dt :textdomain x)))
-	     (or (intl:dgettext domain doc)
+	     (or (and doc (intl:dgettext domain doc))
 		 doc)))))
   (frob function)
   (frob setf)