diff --git a/src/calibre/devices/blackberry/driver.py b/src/calibre/devices/blackberry/driver.py
index 6a9bb84431..0005be54d0 100644
--- a/src/calibre/devices/blackberry/driver.py
+++ b/src/calibre/devices/blackberry/driver.py
@@ -19,7 +19,7 @@ class BLACKBERRY(USBMS):
 
     VENDOR_ID   = [0x0fca]
     PRODUCT_ID  = [0x8004, 0x0004]
-    BCD         = [0x0200, 0x0107, 0x0210]
+    BCD         = [0x0200, 0x0107, 0x0210, 0x0201]
 
     VENDOR_NAME = 'RIM'
     WINDOWS_MAIN_MEM = 'BLACKBERRY_SD'
diff --git a/src/calibre/ebooks/oeb/base.py b/src/calibre/ebooks/oeb/base.py
index 753b1722de..18d3de1e56 100644
--- a/src/calibre/ebooks/oeb/base.py
+++ b/src/calibre/ebooks/oeb/base.py
@@ -760,6 +760,8 @@ class Manifest(object):
 
         def _parse_xml(self, data):
             data = xml_to_unicode(data, strip_encoding_pats=True)[0]
+            if not data:
+                return None
             parser = etree.XMLParser(recover=True)
             try:
                 return etree.fromstring(data, parser=parser)