diff --git a/ChangeLog b/ChangeLog
index 3ebf7caf9..a2a9e3030 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-08-20  Dan Williams  <dcbw@redhat.com>
+
+	* src/supplicant-manager/nm-supplicant-interface.c
+		- (interface_disconnect_done): don't try to dispose of the net proxy
+			when it may already have been disposed of
+
 2007-08-20  Dan Williams  <dcbw@redhat.com>
 
 	* src/nm-device-802-11-wireless.c
diff --git a/src/supplicant-manager/nm-supplicant-interface.c b/src/supplicant-manager/nm-supplicant-interface.c
index a1f09505c..e23c9fb4f 100644
--- a/src/supplicant-manager/nm-supplicant-interface.c
+++ b/src/supplicant-manager/nm-supplicant-interface.c
@@ -917,8 +917,10 @@ interface_disconnect_done (gpointer data)
 	NMSupplicantInfo *info = (NMSupplicantInfo *) data;
 	NMSupplicantInterfacePrivate *priv = NM_SUPPLICANT_INTERFACE_GET_PRIVATE (info->interface);
 
-	g_object_unref (priv->net_proxy);
-	priv->net_proxy = NULL;
+	if (priv->net_proxy) {
+		g_object_unref (priv->net_proxy);
+		priv->net_proxy = NULL;
+	}
 
 	nm_supplicant_info_destroy (data);
 }