Index: wpa_supplicant-0.5.8/wpa_supplicant.c
===================================================================
--- wpa_supplicant-0.5.8.orig/wpa_supplicant.c
+++ wpa_supplicant-0.5.8/wpa_supplicant.c
@@ -2363,7 +2363,8 @@ static void wpa_supplicant_deinit_iface(
 		wpa_clear_keys(wpa_s, NULL);
 	}
 
-	wpas_dbus_unregister_iface(wpa_s);
+	if (wpa_s->global)
+	  wpas_dbus_unregister_iface(wpa_s);
 
 	wpa_supplicant_cleanup(wpa_s);