--- ray/src/common/otypes.c	1991/11/12 16:54:51	2.1
+++ ray/src/common/otypes.c	2003/03/10 17:13:29	2.4
@@ -1,13 +1,14 @@
-/* Copyright (c) 1986 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char RCSid[] = "$Id: otypes.c,v 2.4 2003/03/10 17:13:29 greg Exp $";
 #endif
-
 /*
  * Object type lookup and error reporting
+ *
+ *  External symbols declared in object.h
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "object.h"
@@ -29,6 +30,7 @@ register char  *ofname;
 }
 
 
+void
 objerror(o, etyp, msg)		/* report error related to object */
 OBJREC  *o;
 int  etyp;
@@ -37,6 +39,7 @@ char  *msg;
 	char  msgbuf[128];
 
 	sprintf(msgbuf, "%s for %s \"%s\"",
-			msg, ofun[o->otype].funame, o->oname);
+			msg, ofun[o->otype].funame,
+			o->oname!=NULL ? o->oname : "(NULL)");
 	error(etyp, msgbuf);
 }