diff --git a/src/nm-device-olpc-mesh.c b/src/nm-device-olpc-mesh.c
index edb2560713..8832234427 100644
--- a/src/nm-device-olpc-mesh.c
+++ b/src/nm-device-olpc-mesh.c
@@ -423,7 +423,7 @@ create_socket_with_request (NMDevice *self, struct iwreq *req)
 	g_return_val_if_fail (self != NULL, -1);
 
 	sk = socket (AF_INET, SOCK_DGRAM, 0);
-	if (!sk) {
+	if (sk == -1) {
 		nm_log_err (LOGD_OLPC_MESH, "Couldn't create socket: %d.", errno);
 		return -1;
 	}
@@ -510,7 +510,7 @@ nm_device_olpc_mesh_set_ssid (NMDeviceOlpcMesh *self, const GByteArray * ssid)
 	g_return_if_fail (self != NULL);
 
 	sk = socket (AF_INET, SOCK_DGRAM, 0);
-	if (!sk) {
+	if (sk == -1) {
 		nm_log_err (LOGD_OLPC_MESH, "Couldn't create socket: %d.", errno);
 		return;
 	}
diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
index 36714e52a5..a98347688f 100644
--- a/src/nm-device-wifi.c
+++ b/src/nm-device-wifi.c
@@ -1831,7 +1831,7 @@ nm_device_wifi_get_ssid (NMDeviceWifi *self)
 	priv = NM_DEVICE_WIFI_GET_PRIVATE (self);
 
 	sk = socket (AF_INET, SOCK_DGRAM, 0);
-	if (!sk) {
+	if (sk == -1) {
 		nm_log_err (LOGD_HW, "couldn't create socket: %d.", errno);
 		return NULL;
 	}
diff --git a/src/nm-udev-manager.c b/src/nm-udev-manager.c
index e0795e81fb..72501c280d 100644
--- a/src/nm-udev-manager.c
+++ b/src/nm-udev-manager.c
@@ -384,6 +384,9 @@ is_wireless (GUdevDevice *device)
 	g_assert (ifname);
 
 	fd = socket (PF_INET, SOCK_DGRAM, 0);
+	if (fd == -1)
+		return FALSE;
+
 	strncpy (iwr.ifr_ifrn.ifrn_name, ifname, IFNAMSIZ);
 
 	path = g_udev_device_get_sysfs_path (device);