diff --git a/ChangeLog b/ChangeLog
index a9257800c2..b3a93e6cb2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-01  Robert Love  <rml@novell.com>
+
+	* gnome/applet/applet-compat.c: Warn if the returned escaped ESSID is
+	  empty, too.
+
 2006-04-27  Jeremy Katz  <katzj@redhat.com>
 
 	* src/nm-device.c (discover_device_type): Actually use the hal
diff --git a/gnome/applet/applet-compat.c b/gnome/applet/applet-compat.c
index ec244af22f..1764ded96c 100644
--- a/gnome/applet/applet-compat.c
+++ b/gnome/applet/applet-compat.c
@@ -280,7 +280,7 @@ convert_one_entry (GConfClient *client,
 	g_return_if_fail (client != NULL);
 	g_return_if_fail (essid != NULL);
 
-	if (!(escaped_network = gconf_escape_key (essid, strlen (essid))))
+	if (!(escaped_network = gconf_escape_key (essid, strlen (essid))) || strlen (escaped_network) < 0)
 	{
 		nm_warning ("%s:%d (%s): couldn't unescape network name '%s'.",
 				__FILE__, __LINE__, __func__, essid);