diff --git a/src/calibre/devices/mtp/driver.py b/src/calibre/devices/mtp/driver.py
index 3c9edad9ec..fa1f87cf41 100644
--- a/src/calibre/devices/mtp/driver.py
+++ b/src/calibre/devices/mtp/driver.py
@@ -74,11 +74,11 @@ class MTP_DEVICE(BASE):
             for x in ('format_map', 'send_template', 'send_to'):
                 del self.prefs[x]
 
-    def open(self, devices, library_uuid):
+    def open(self, device, library_uuid):
         self.current_library_uuid = library_uuid
         self.location_paths = None
         self.driveinfo = {}
-        BASE.open(self, devices, library_uuid)
+        BASE.open(self, device, library_uuid)
         h = self.prefs['history']
         if self.current_serial_num:
             h[self.current_serial_num] = (self.current_friendly_name,
diff --git a/src/calibre/devices/mtp/windows/driver.py b/src/calibre/devices/mtp/windows/driver.py
index b6adb2a036..08f9490b54 100644
--- a/src/calibre/devices/mtp/windows/driver.py
+++ b/src/calibre/devices/mtp/windows/driver.py
@@ -332,7 +332,7 @@ class MTP_DEVICE(MTPDeviceBase):
                 self.dev.get_file(f.object_id, stream, callback)
         except Exception as e:
             raise DeviceError('Failed to fetch the file %s with error: %s'%
-                    f.full_path, as_unicode(e))
+                    (f.full_path, as_unicode(e)))
         stream.seek(0)
         if set_name:
             stream.name = f.name