3 files changed, 7 insertions, 9 deletions
diff --git a/grc/core/Param.py b/grc/core/Param.py
index d155800c43..201032d010 100644
--- a/grc/core/Param.py
+++ b/grc/core/Param.py
@@ -642,10 +642,8 @@ class Param(Element):
         if t in ('string', 'file_open', 'file_save', '_multiline', '_multiline_python_external'):
             if not self._init:
                 self.evaluate()
-            if self._stringify_flag:
-                return '"%s"' % v.replace('"', '\"')
-            else:
-                return v
+            return repr(v) if self._stringify_flag else v
+
         # Vector types
         elif t in ('complex_vector', 'real_vector', 'float_vector', 'int_vector'):
             if not self._init:
diff --git a/grc/gui/BlockTreeWindow.py b/grc/gui/BlockTreeWindow.py
index f49eb6c4fe..f0373eaf2a 100644
--- a/grc/gui/BlockTreeWindow.py
+++ b/grc/gui/BlockTreeWindow.py
@@ -202,10 +202,10 @@ class BlockTreeWindow(gtk.VBox):
         """Update the documentation column of every block"""
 
         def update_doc(model, _, iter_):
-            if model.iter_has_child(iter_):
-                return  # category node, no doc string
             key = model.get_value(iter_, KEY_INDEX)
-            block = self.platform.blocks[key]
+            if not key:
+                return  # category node, no doc string
+            block = self.platform.get_block(key)
             doc = Utils.parse_template(DOC_MARKUP_TMPL, doc=block.get_doc())
             model.set_value(iter_, DOC_INDEX, doc)
 
diff --git a/grc/gui/Preferences.py b/grc/gui/Preferences.py
index 5fbdfe927a..d377018eb4 100644
--- a/grc/gui/Preferences.py
+++ b/grc/gui/Preferences.py
@@ -74,7 +74,7 @@ def entry(key, value=None, default=None):
         }.get(_type, _config_parser.get)
         try:
             result = getter('main', key)
-        except ConfigParser.Error:
+        except (AttributeError, ConfigParser.Error):
             result = _type() if default is None else default
     return result
 
@@ -106,7 +106,7 @@ def get_file_list(key):
     try:
         files = [value for name, value in _config_parser.items(key)
                  if name.startswith('%s_' % key)]
-    except ConfigParser.Error:
+    except (AttributeError, ConfigParser.Error):
         files = []
     return files