*** hald_dbus.c.orig	Fri Oct 12 10:23:43 2007
--- hald_dbus.c	Fri Oct 12 10:24:30 2007
***************
*** 5201,5207 ****
  			}
  		}
  
! 		g_hash_table_foreach_remove (singletons, (GHRFunc) singleton_remove_by_connection, connection);
  
  		dbus_connection_unref (connection);
  		return DBUS_HANDLER_RESULT_HANDLED;
--- 5201,5208 ----
  			}
  		}
  
! 		if (singletons != NULL)
! 			g_hash_table_foreach_remove (singletons, (GHRFunc) singleton_remove_by_connection, connection);
  
  		dbus_connection_unref (connection);
  		return DBUS_HANDLER_RESULT_HANDLED;