Index: plugins/bbdb/ChangeLog
===================================================================
--- plugins/bbdb/ChangeLog	(revision 34731)
+++ plugins/bbdb/ChangeLog	(working copy)
@@ -1,3 +1,9 @@
+2007-12-21  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #502914
+
+	* bbdb.c: (enable_toggled_cb): Do not write NULL into gconf.
+
 2007-12-03  Srinivasa Ragavan  <sragavan@novell.com>
 
 	** Fix for bug #391062
Index: plugins/bbdb/bbdb.c
===================================================================
--- plugins/bbdb/bbdb.c	(revision 34731)
+++ plugins/bbdb/bbdb.c	(working copy)
@@ -401,7 +401,7 @@
 		gconf_client_set_string (
 			stuff->target->gconf,
 			GCONF_KEY_WHICH_ADDRESSBOOK,
-			uri, &error);
+			uri ? uri : "", &error);
 
 		if (error != NULL) {
 			g_warning ("%s", error->message);
