diff --git a/js/ui/placeDisplay.js b/js/ui/placeDisplay.js
index 9e3ed87b0..67da06c65 100644
--- a/js/ui/placeDisplay.js
+++ b/js/ui/placeDisplay.js
@@ -97,7 +97,14 @@ PlaceDeviceInfo.prototype = {
     },
 
     _removeFinish: function(o, res, data) {
-        this._mount.unmount_finish(res);
+        try {
+            this._mount.unmount_finish(res);
+        } catch (e) {
+            let message = _("Failed to unmount '%s'").format(o.get_name());
+            Main.overview.infoBar.setMessage(message,
+                                             Lang.bind(this, this.remove),
+                                             _("Retry"));
+        }
     }
 };