diff --git a/src/calibre/ebooks/lrf/objects.py b/src/calibre/ebooks/lrf/objects.py
index a46417aa1a..0045e679a3 100644
--- a/src/calibre/ebooks/lrf/objects.py
+++ b/src/calibre/ebooks/lrf/objects.py
@@ -881,7 +881,10 @@ class Text(LRFStream):
                     open_containers.append(c)
 
         if len(open_containers) > 0:
-            raise LRFParseError('Malformed text stream %s'%([i.name for i in open_containers if isinstance(i, Text.TextTag)],))
+            if len(open_containers) == 1:
+                s += u'</%s>'%(open_containers[0].name,)
+            else:
+                raise LRFParseError('Malformed text stream %s'%([i.name for i in open_containers if isinstance(i, Text.TextTag)],))
         return s
 
     def to_html(self):
diff --git a/src/calibre/gui2/dialogs/metadata_single.py b/src/calibre/gui2/dialogs/metadata_single.py
index 4198fc5684..63dc54df18 100644
--- a/src/calibre/gui2/dialogs/metadata_single.py
+++ b/src/calibre/gui2/dialogs/metadata_single.py
@@ -148,7 +148,9 @@ class MetadataSingleDialog(ResizableDialog, Ui_MetadataSingleDialog):
                 bad_perms.append(_file)
                 continue
 
-            _file = run_plugins_on_import(_file)
+            nfile = run_plugins_on_import(_file)
+            if nfile is not None:
+                _file = nfile
             size = os.stat(_file).st_size
             ext = os.path.splitext(_file)[1].lower().replace('.', '')
             for row in range(self.formats.count()):
diff --git a/src/calibre/manual/faq.rst b/src/calibre/manual/faq.rst
index 37bd6f289b..9bdd9aaa6b 100644
--- a/src/calibre/manual/faq.rst
+++ b/src/calibre/manual/faq.rst
@@ -270,11 +270,13 @@ Why does |app| show only some of my fonts on OS X?
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 There can be several causes for this:
 
-    * **Any windows version**: Try running it as Administrator (Right click on the icon ans select "Run as Administrator")
-    * **Any windows version**: If this happens during an initial run of calibre, try deleting the folder you chose for your ebooks and restarting calibre.
+    * If you get an error about a Python function terminating unexpectedly after upgrading calibre, first uninstall calibre, then delete the folders (if they exists)
+      :file:`C:\\Program Files\\Calibre` and :file:`C:\\Program Files\\Calibre2`. Now re-install and you should be fine.
+    * If you get an error in the welcome wizard on an initial run of calibre, try choosing a folder like :file:`C:\\library` as the calibre library (calibre sometimes
+      has trouble with library locations if the path contains non-English characters, or only numbers, etc.)
+    * Try running it as Administrator (Right click on the icon and select "Run as Administrator")
     * **Windows Vista**: If the folder :file:`C:\\Users\\Your User Name\\AppData\\Local\\VirtualStore\\Program Files\\calibre` exists, delete it. Uninstall |app|. Reboot. Re-install.
-    * **Any windows version**: Search your computer for a folder named :file:`_ipython`. Delete it and try again.
-    * **Any windows version**: Try disabling any antivirus program you have running and see if that fixes it. Also try diabling any firewall software that prevents connections to the local computer.
+    * **Any windows version**: Try disabling any antivirus program you have running and see if that fixes it. Also try disabling any firewall software that prevents connections to the local computer.
 
 If it still wont launch, start a command prompt (press the windows key and R; then type :command:`cmd.exe` in the Run dialog that appears). At the command prompt type the following command and press Enter::