diff --git a/libnm-util/nm-setting-wimax.c b/libnm-util/nm-setting-wimax.c
index 349a3ae8ea..c37af8cdc9 100644
--- a/libnm-util/nm-setting-wimax.c
+++ b/libnm-util/nm-setting-wimax.c
@@ -16,11 +16,14 @@
  * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301 USA.
  *
+ * (C) Copyright 2011 Red Hat, Inc.
  * (C) Copyright 2009 Novell, Inc.
  */
 
+#include <string.h>
 #include <net/ethernet.h>
 #include <dbus/dbus-glib.h>
+
 #include "nm-setting-wimax.h"
 #include "nm-param-spec-specialized.h"
 
@@ -111,6 +114,15 @@ verify (NMSetting *setting, GSList *all_settings, GError **error)
 		return FALSE;
 	}
 
+	if (!strlen (priv->network_name)) {
+		g_set_error (error,
+					 NM_SETTING_WIMAX_ERROR,
+					 NM_SETTING_WIMAX_ERROR_INVALID_PROPERTY,
+					 NM_SETTING_WIMAX_NETWORK_NAME);
+
+		return FALSE;
+	}
+
 	if (priv->mac_address && priv->mac_address->len != ETH_ALEN) {
 		g_set_error (error,
 		             NM_SETTING_WIMAX_ERROR,