diff --git a/ChangeLog b/ChangeLog
index 5b86889c5..b2d7c0427 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-12-05  Robert Love  <rml@novell.com>
+
+	* src/NetworkManager.c: don't call nm_data_free() when there is nothing
+	  to free, particularly here as it just barfs.
+
 2005-12-05  Dan Williams  <dcbw@redhat.com>
 
 	* gnome/applet/applet-dbus.c
diff --git a/src/NetworkManager.c b/src/NetworkManager.c
index 6b272bace..f4ab55375 100644
--- a/src/NetworkManager.c
+++ b/src/NetworkManager.c
@@ -903,7 +903,6 @@ int main( int argc, char *argv[] )
 			  "Either dbus is not running, or the "
 			  "NetworkManager dbus security policy "
 			  "was not loaded.");
-		nm_data_free (nm_data);
 		exit (EXIT_FAILURE);
 	}