diff --git a/src/calibre/ebooks/fb2/input.py b/src/calibre/ebooks/fb2/input.py
index efe2606141..12fa1da8e9 100644
--- a/src/calibre/ebooks/fb2/input.py
+++ b/src/calibre/ebooks/fb2/input.py
@@ -45,7 +45,7 @@ class FB2Input(InputFormatPlugin):
 
         log.debug('Parsing XML...')
         parser = etree.XMLParser(recover=True, no_network=True)
-        doc = etree.parse(stream, parser)
+        doc = etree.fromstring(stream.read())
         self.extract_embedded_content(doc)
         log.debug('Converting XML to HTML...')
         ss = open(P('templates/fb2.xsl'), 'rb').read()
diff --git a/src/calibre/ebooks/metadata/meta.py b/src/calibre/ebooks/metadata/meta.py
index 28dcbf5ae0..2fb70d71b8 100644
--- a/src/calibre/ebooks/metadata/meta.py
+++ b/src/calibre/ebooks/metadata/meta.py
@@ -130,7 +130,7 @@ def metadata_from_filename(name, pat=None):
             au = match.group('author')
             aus = string_to_authors(au)
             mi.authors = aus
-        except IndexError:
+        except (IndexError, ValueError):
             pass
         try:
             mi.series = match.group('series')