diff --git a/info-daemon/NetworkManagerInfoDbus.c b/info-daemon/NetworkManagerInfoDbus.c
index 65a1d22437..ce74b03eeb 100644
--- a/info-daemon/NetworkManagerInfoDbus.c
+++ b/info-daemon/NetworkManagerInfoDbus.c
@@ -235,7 +235,8 @@ static DBusMessage *nmi_dbus_get_allowed_network_prio (NMIAppInfo *info, DBusMes
 	g_return_val_if_fail (message != NULL, NULL);
 
 	dbus_error_init (&error);
-	if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID))
+	if (    !dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID)
+		|| (strlen (network) <= 0))
 	{
 		reply_message = nmi_dbus_create_error_message (message, NMI_DBUS_NMI_NAMESPACE, "InvalidNetwork",
 							"NetworkManagerInfo::getAllowedNetworkPriority called with invalid network.");
@@ -283,7 +284,8 @@ static DBusMessage *nmi_dbus_get_allowed_network_essid (NMIAppInfo *info, DBusMe
 	g_return_val_if_fail (message != NULL, NULL);
 
 	dbus_error_init (&error);
-	if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID))
+	if (    !dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID)
+		|| (strlen (network) <= 0))
 	{
 		reply_message = nmi_dbus_create_error_message (message, NMI_DBUS_NMI_NAMESPACE, "InvalidNetwork",
 							"NetworkManagerInfo::getAllowedNetworkEssid called with invalid network.");
@@ -331,7 +333,8 @@ static DBusMessage *nmi_dbus_get_allowed_network_key (NMIAppInfo *info, DBusMess
 	g_return_val_if_fail (message != NULL, NULL);
 
 	dbus_error_init (&error);
-	if (!dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID))
+	if (    !dbus_message_get_args (message, &error, DBUS_TYPE_STRING, &network, DBUS_TYPE_INVALID)
+		|| (strlen (network) <= 0))
 	{
 		reply_message = nmi_dbus_create_error_message (message, NMI_DBUS_NMI_NAMESPACE, "InvalidNetwork",
 							"NetworkManagerInfo::getAllowedNetworkKey called with invalid network.");
diff --git a/src/NetworkManagerAPList.c b/src/NetworkManagerAPList.c
index ab026643c8..cd16558fa9 100644
--- a/src/NetworkManagerAPList.c
+++ b/src/NetworkManagerAPList.c
@@ -121,7 +121,10 @@ void nm_ap_list_populate (NMData *data)
 	{
 		int	i;
 		for (i = 0; i < num_networks; i++)
-			nm_ap_list_update_network (data, networks[i]);
+		{
+			if (networks[i] && (strlen (networks[i]) > 0))
+				nm_ap_list_update_network (data, networks[i]);
+		}
 
 		dbus_free_string_array (networks);
 	}