diff --git a/ChangeLog b/ChangeLog
index 0c666b3bf..4aec8f150 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-06-30  Robert Love  <rml@novell.com>
+
+	* src/NetworkManagerDevice.c: g_malloc0 cannot fail.
+
 2005-06-27  Robert Love  <rml@novell.com>
 
 	* src/nm-dbus-nm.c: fix "setWirelessEnabled" call for the enabling
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index 36d8ea9f4..639211e59 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -290,11 +290,6 @@ NMDevice *nm_device_new (const char *iface, const char *udi, gboolean test_dev,
 	}
 
 	dev = g_malloc0 (sizeof (NMDevice));
-	if (!dev)
-	{
-		nm_warning ("could not allocate a new device...  Not enough memory?");
-		return (NULL);
-	}
 
 	dev->refcount = 2; /* 1 for starters, and another 1 for the worker thread */
 	dev->app_data = app_data;