diff --git a/code/generic-site.lisp b/code/generic-site.lisp
index c1495a4055f9c190314d533a73b2a47c7cb087df..5d2e49f6c17ff86829e480e63f4972f45fda76e6 100644
--- a/code/generic-site.lisp
+++ b/code/generic-site.lisp
@@ -5,7 +5,7 @@
 ;;; Carnegie Mellon University, and has been placed in the public domain.
 ;;;
 (ext:file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/generic-site.lisp,v 1.15 2003/02/05 14:41:11 emarsden Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/code/generic-site.lisp,v 1.16 2005/05/03 18:02:25 rtoy Exp $")
 ;;;
 ;;; **********************************************************************
 ;;;
@@ -21,11 +21,12 @@
 ;;; We would appreciate it if each site establishes a local maintainer who can
 ;;; filter bug reports from novice users to make sure that they really have
 ;;; found a bug.  Fill in the maintainer's address here..
-(rplaca
- (cdr (member :bugs *herald-items*))
- '("Send questions and bug reports to your local CMUCL maintainer, " terpri
-   "or see <http://www.cons.org/cmucl/support.html>." terpri
-   "Loaded subsystems:" terpri))
+(when *herald-items*
+  (rplaca
+   (cdr (member :bugs *herald-items*))
+   '("Send questions and bug reports to your local CMUCL maintainer, " terpri
+     "or see <http://www.cons.org/cmucl/support.html>." terpri
+     "Loaded subsystems:" terpri)))
 
 ;;; If you have sources installed on your system, un-comment the following form
 ;;; and change it to point to the source location.  This will allow the Hemlock