--- gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c.no-dbus	2006-09-19 13:36:28.000000000 -0400
+++ gnome-vfs-2.16.0/libgnomevfs/gnome-vfs-volume-monitor-client.c	2006-09-19 13:37:11.000000000 -0400
@@ -201,6 +201,9 @@
 
 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
 
+	if (volume_monitor_client->dbus_conn == NULL)
+		return;
+
 	list = get_drives (volume_monitor_client->dbus_conn, volume_monitor);
 	for (l = list; l; l = l->next) {
 		drive = l->data;
@@ -221,6 +224,9 @@
 
 	volume_monitor = GNOME_VFS_VOLUME_MONITOR (volume_monitor_client);
 
+	if (volume_monitor_client->dbus_conn == NULL)
+		return;
+
 	list = get_volumes (volume_monitor_client->dbus_conn, volume_monitor);
 	for (l = list; l; l = l->next) {
 		volume = l->data;