--- dbus-1.2.4/dbus/dbus-bus.c-orig	2008-10-09 23:21:47.719176000 +0000
+++ dbus-1.2.4/dbus/dbus-bus.c	2008-10-09 23:26:52.476156000 +0000
@@ -380,6 +380,7 @@ internal_bus_get (DBusBusType  type,
   DBusConnection *connection;
   BusData *bd;
   DBusBusType address_type;
+  dbus_bool_t dbus_init = initialized;
 
   _dbus_return_val_if_fail (type >= 0 && type < N_BUS_TYPES, NULL);
   _dbus_return_val_if_error_is_set (error, NULL);
@@ -435,6 +436,12 @@ internal_bus_get (DBusBusType  type,
     {
       _DBUS_ASSERT_ERROR_IS_SET (error);
       _DBUS_UNLOCK (bus);
+
+      /* If we failed to get a connection, do not initialize */
+      if (!dbus_init) {
+         addresses_shutdown_func (NULL);
+      }
+
       return NULL;
     }