diff --git a/pcl/env.lisp b/pcl/env.lisp
index 3b678afc76585f6d92ed23f5dd1f919afc8e6911..4ad93356f12fe9baa758bacf6051f065dde4765e 100644
--- a/pcl/env.lisp
+++ b/pcl/env.lisp
@@ -26,7 +26,7 @@
 ;;;
 
 (file-comment
-  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/env.lisp,v 1.21 2003/05/04 13:11:21 gerd Exp $")
+  "$Header: /Volumes/share2/src/cmucl/cvs2git/cvsroot/src/pcl/env.lisp,v 1.22 2003/05/17 16:20:36 gerd Exp $")
 ;;;
 ;;; Basic environmental stuff.
 ;;;
@@ -276,6 +276,14 @@
 
 (defgeneric make-load-form (object &optional environment))
 
+(macrolet ((define-default-method (class)
+	     `(defmethod make-load-form ((object ,class) &optional env)
+		(declare (ignore env))
+		(error "~@<Default ~s method for ~s called.~@>"
+		       'make-load-form object))))
+  (define-default-method condition)
+  (define-default-method standard-object))
+
 (defmethod make-load-form ((object structure-object) &optional environment)
   (declare (ignore environment))
   (kernel:make-structure-load-form object))