diff --git a/src/calibre/devices/usbms/device.py b/src/calibre/devices/usbms/device.py
index f085ab8989..f826167d16 100644
--- a/src/calibre/devices/usbms/device.py
+++ b/src/calibre/devices/usbms/device.py
@@ -740,12 +740,17 @@ class Device(DeviceConfig, DevicePlugin):
                 umount(d)
             except:
                 pass
+        failures = False
         for d in drives:
             try:
                 eject(d)
             except Exception, e:
                 print 'Udisks eject call for:', d, 'failed:'
                 print '\t', e
+                failures = True
+
+        if not failures:
+            return
 
         for drive in drives:
             cmd = 'calibre-mount-helper'