diff --git a/ChangeLog b/ChangeLog
index 271cb274da..bd6547588d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-29  Dan Williams <dcbw@redhat.com>
+
+	* src/NetworkManagerDevice.c
+		- (nm_device_force_use): Fix possible segfault
+
 2005-03-29  Dan Williams <dcbw@redhat.com>
 
 	* src/NetworkManagerDevice.c
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index 2b2486d558..71115b7547 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -3241,9 +3241,11 @@ gboolean nm_device_force_use (gpointer user_data)
 	
 out:
 	/* Function that scheduled us must ref the device */
-	nm_device_unref (cb_data->dev);
+	if (cb_data->dev)
+		nm_device_unref (cb_data->dev);
+	if (app_data)
+		app_data->forcing_device = FALSE;
 
-	app_data->forcing_device = FALSE;
 	g_free (cb_data);
 	return FALSE;
 }