diff --git a/ChangeLog b/ChangeLog
index 2e7952e500..9bf19c82d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-12  Robert Love  <rml@novell.com>
+
+	* src/vpn-manager/nm-dbus-vpn.c: Do not call the lengthy-named function
+	  nm_vpn_manager_remove_connection() unless vpn is non-NULL.
+
 2005-12-12  Robert Love  <rml@novell.com>
 
 	* src/named-manager/nm-named-manager.c: Don't unref the config until
diff --git a/src/vpn-manager/nm-dbus-vpn.c b/src/vpn-manager/nm-dbus-vpn.c
index 78bca57023..41caef9e9b 100644
--- a/src/vpn-manager/nm-dbus-vpn.c
+++ b/src/vpn-manager/nm-dbus-vpn.c
@@ -391,7 +391,8 @@ static void nm_dbus_vpn_update_one_connection_cb (DBusPendingCall *pcall, void *
 
 		if (new)
 			vpn = nm_vpn_manager_add_connection (cb_data->data->vpn_manager, con_name, service_name, user_name);
-		nm_dbus_vpn_signal_vpn_connection_update (cb_data->data->dbus_connection, vpn, new ? "VPNConnectionAdded" : "VPNConnectionUpdate");
+		if (vpn)
+			nm_dbus_vpn_signal_vpn_connection_update (cb_data->data->dbus_connection, vpn, new ? "VPNConnectionAdded" : "VPNConnectionUpdate");
 	}
 	dbus_message_unref (reply);