diff --git a/ChangeLog b/ChangeLog
index c2da9fde56..8a7c2e5069 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-14  Dan Williams  <dcbw@redhat.com>
+
+	* src/NetworkManagerSystem.c
+		- (nm_system_device_is_up_with_iface): clean up
+
 2008-05-13  Dan Williams  <dcbw@redhat.com>
 
 	Fix refcounting issues over sleep/wake when a VPN connection was active that
diff --git a/src/NetworkManagerSystem.c b/src/NetworkManagerSystem.c
index 30d4a78ed1..6713ac866d 100644
--- a/src/NetworkManagerSystem.c
+++ b/src/NetworkManagerSystem.c
@@ -470,7 +470,8 @@ gboolean
 nm_system_device_is_up_with_iface (const char *iface)
 {
 	struct ifreq ifr;
-	int err, fd;
+	int fd;
+	gboolean up = FALSE;
 
 	fd = socket (PF_INET, SOCK_DGRAM, 0);
 	if (fd < 0) {
@@ -480,18 +481,17 @@ nm_system_device_is_up_with_iface (const char *iface)
 
 	/* Get device's flags */
 	strncpy (ifr.ifr_name, iface, IFNAMSIZ);
-	err = ioctl (fd, SIOCGIFFLAGS, &ifr);
+	if (ioctl (fd, SIOCGIFFLAGS, &ifr) < 0) {
+		if (errno != ENODEV) {
+			nm_warning ("%s: could not get flags for device %s.  errno = %d", 
+			            __func__, iface, errno);
+		}
+	} else {
+		up = !!(ifr.ifr_flags & IFF_UP);
+	}
 	close (fd);
 
-	if (!err)
-		return (!((ifr.ifr_flags^IFF_UP) & IFF_UP));
-
-	if (errno != ENODEV) {
-		nm_warning ("%s: could not get flags for device %s.  errno = %d", 
-		            __func__, iface, errno);
-	}
-
-	return FALSE;
+	return up;
 }
 
 gboolean