diff --git a/ChangeLog b/ChangeLog
index a2cfc657d..673031ce6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-09-06  Dan Williams  <dcbw@redhat.com>
+
+	Patch from Tomislav Vujec <tvujec@redhat.com>
+	* src/NetworkManagerDevice.c
+		- (nm_get_device_by_udi): don't return a device when we
+			actually didn't find what we were looking for
+
 2005-09-06  Christopher Aillon  <caillon@redhat.com>
 
 	* gnome/applet/applet-dbus-devices.c:
diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c
index 0f8cb4519..8664a08b2 100644
--- a/src/NetworkManagerDevice.c
+++ b/src/NetworkManagerDevice.c
@@ -166,11 +166,11 @@ NMDevice *nm_get_device_by_udi (NMData *data, const char *udi)
 		if ((dev = (NMDevice *)(elt->data)))
 		{
 			if (nm_null_safe_strcmp (nm_device_get_udi (dev), udi) == 0)
-				break;
+				return dev;
 		}
 	}
 
-	return (dev);
+	return NULL;
 }