diff --git a/gnome-settings-daemon/ChangeLog b/gnome-settings-daemon/ChangeLog
index 3daa1e478..4b7c4b399 100644
--- a/gnome-settings-daemon/ChangeLog
+++ b/gnome-settings-daemon/ChangeLog
@@ -1,3 +1,8 @@
+2007-03-22  Jens Granseuer  <jensgr@gmx.net>
+
+	* gnome-settings-dbus.c: (gnome_settings_server_init): don't crash if
+	dbus connection is not available (part of bug #411504)
+
 2007-03-20  Priit Laes  <plaes@svn.gnome.org>
 
 	* gnome-settings-multimedia-keys.c: (do_media_action), (do_action): Added
diff --git a/gnome-settings-daemon/gnome-settings-dbus.c b/gnome-settings-daemon/gnome-settings-dbus.c
index 53e119c5b..81d310caa 100644
--- a/gnome-settings-daemon/gnome-settings-dbus.c
+++ b/gnome-settings-daemon/gnome-settings-dbus.c
@@ -207,6 +207,9 @@ gnome_settings_server_init (GnomeSettingsServer * server)
 	    GNOME_SETTINGS_SERVER_GET_CLASS (server);
 	unsigned request_ret;
 
+	if (klass->connection == NULL)
+		return;
+
 	/* Register DBUS path */
 	dbus_g_connection_register_g_object (klass->connection,
 					     "/org/gnome/SettingsDaemon",