diff --git a/ChangeLog b/ChangeLog
index 43d7b51682..3163d292d6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17,6 +17,8 @@
 	* src/gnome/ui/gnc-main-window-ui.xml: Add the "Close Books" menu
 	item.
 
+	* src/engine/qofid.[ch]: Fix another crash caused by qof changes.
+
 2003-10-25  David Hampton  <hampton@employees.org>
 
 	* src/gnome-utils/dialog-account.[ch]:
diff --git a/src/engine/qofid.c b/src/engine/qofid.c
index a7f938f7d0..5f90625b39 100644
--- a/src/engine/qofid.c
+++ b/src/engine/qofid.c
@@ -102,10 +102,10 @@ qof_entity_set_guid (QofEntity *ent, const GUID *guid)
   qof_collection_insert_entity (col, ent);
 }
 
-GUID *
+const GUID *
 qof_entity_get_guid (QofEntity *ent)
 {
-  if (!ent) return NULL;
+  if (!ent) return guid_null();
   return &ent->guid;
 }
 
diff --git a/src/engine/qofid.h b/src/engine/qofid.h
index f083495a19..a51c4109ea 100644
--- a/src/engine/qofid.h
+++ b/src/engine/qofid.h
@@ -115,7 +115,7 @@ void qof_entity_init (QofEntity *, QofIdType, QofCollection *);
 void qof_entity_release (QofEntity *);
 
 /* Return the GUID of this entity */
-GUID * qof_entity_get_guid (QofEntity *);
+const GUID * qof_entity_get_guid (QofEntity *);
 
 /** collections of entities */
 QofCollection * qof_collection_new (QofIdType type);