diff --git a/ChangeLog b/ChangeLog
index 214001ccd..72adbe18e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-10  Dan Williams  <dcbw@redhat.com>
+
+	* src/NetworkManagerAP.c
+		- (foreach_property_cb): catch more hidden SSID formats
+
 2008-01-10  Dan Williams  <dcbw@redhat.com>
 
 	Fix gnome.org #464215.  Requires the kernel patch titled
diff --git a/src/NetworkManagerAP.c b/src/NetworkManagerAP.c
index f6d9c911e..d038b5e5b 100644
--- a/src/NetworkManagerAP.c
+++ b/src/NetworkManagerAP.c
@@ -391,6 +391,9 @@ foreach_property_cb (gpointer key, gpointer value, gpointer user_data)
 				&& (memcmp (array->data, "<hidden>", 8) == 0))
 				return;
 
+			if (nm_utils_is_empty_ssid ((const guint8 *) array->data, len))
+				return;
+
 			ssid = g_byte_array_sized_new (len);
 			g_byte_array_append (ssid, (const guint8 *) array->data, len);
 			nm_ap_set_ssid (ap, ssid);