diff --git a/archiver/ChangeLog b/archiver/ChangeLog
index cbbb10309..01d775dde 100644
--- a/archiver/ChangeLog
+++ b/archiver/ChangeLog
@@ -1,3 +1,8 @@
+2001-09-22  Bradford Hovinen  <hovinen@ximian.com>
+
+	* bonobo-config-archiver.c (notify_listeners): Abort if the object
+	is already destroyed
+
 2001-09-07  Bradford Hovinen  <hovinen@ximian.com>
 
 	* archiver-client.c (location_client_store_xml): Make backend_id
diff --git a/archiver/bonobo-config-archiver.c b/archiver/bonobo-config-archiver.c
index b2ee2d628..a9a9a7f58 100644
--- a/archiver/bonobo-config-archiver.c
+++ b/archiver/bonobo-config-archiver.c
@@ -231,22 +231,25 @@ real_sync (BonoboConfigDatabase *db,
 
 static void
 notify_listeners (BonoboConfigArchiver *archiver_db, 
-		  const char        *key, 
-		  const CORBA_any   *value)
+		  const char           *key, 
+		  const CORBA_any      *value)
 {
 	CORBA_Environment ev;
 	char *dir_name;
 	char *leaf_name;
 	char *ename;
 
+	if (GTK_OBJECT_DESTROYED (archiver_db))
+		return;
+
 	if (!key)
 		return;
 
-	CORBA_exception_init(&ev);
+	CORBA_exception_init (&ev);
 
 	ename = g_strconcat ("Bonobo/Property:change:", key, NULL);
 
-	bonobo_event_source_notify_listeners(archiver_db->es, ename, value, &ev);
+	bonobo_event_source_notify_listeners (archiver_db->es, ename, value, &ev);
 
 	g_free (ename);