diff --git a/src/calibre/devices/mtp/windows/driver.py b/src/calibre/devices/mtp/windows/driver.py
index d030e2a53c..63eef1df66 100644
--- a/src/calibre/devices/mtp/windows/driver.py
+++ b/src/calibre/devices/mtp/windows/driver.py
@@ -303,8 +303,8 @@ class MTP_DEVICE(MTPDeviceBase):
                     e.full_path,))
             self.delete_file_or_folder(e)
         sid, pid = parent.storage_id, parent.object_id
-        ans = self.dev.put_file(sid, pid, name, stream, size, callback)
-        ans['storage_id'] = parent.storage_id
+        ans = self.dev.put_file(pid, name, stream, size, callback)
+        ans['storage_id'] = sid
         return parent.add_child(ans)
 
 
diff --git a/src/calibre/devices/mtp/windows/remote.py b/src/calibre/devices/mtp/windows/remote.py
index a02b955522..5be782e611 100644
--- a/src/calibre/devices/mtp/windows/remote.py
+++ b/src/calibre/devices/mtp/windows/remote.py
@@ -63,6 +63,8 @@ def main():
     try:
         devices = win_scanner()
         pnp_id = dev.detect_managed_devices(devices)
+        if not pnp_id:
+            raise ValueError('Failed to detect device')
         # pprint.pprint(dev.detected_devices)
         print ('Trying to connect to:', pnp_id)
         dev.open(pnp_id, '')