#5884: don't crash on non-ascii characters in essids.

1 files changed, 4 insertions, 6 deletions

diff --git a/shell/hardware/nminfo.py b/shell/hardware/nminfo.py
index c1a6326..3a93120 100644
--- a/shell/hardware/nminfo.py
+++ b/shell/hardware/nminfo.py
@@ -394,15 +394,13 @@ class NMInfo(object):
         config.read(self._cfg_file)
         networks = {}
         for name in config.sections():
-            if not isinstance(name, unicode):
-                name = unicode(name)
-            net = Network(name)
             try:
+                net = Network(name)
                 net.read_from_config(config)
                 networks[name] = net
-            except NetworkInvalidError, e:
-                logging.debug("Error: invalid stored network config: %s" % e)
-                del net
+            except Exception, e:
+                logging.error("Error when processing config for the network %s: %r" % (name, e))
+
         del config
         return networks