diff --git a/roles/usb_lib/files/usbmount/usbmount b/roles/usb_lib/files/usbmount/usbmount
index 284069a19..3a4e26c29 100644
--- a/roles/usb_lib/files/usbmount/usbmount
+++ b/roles/usb_lib/files/usbmount/usbmount
@@ -15,7 +15,7 @@
 # PARTICULAR PURPOSE.
 # https://github.com/iiab/iiab/blob/master/roles/usb_lib/files/usbmount/copyright
 # https://github.com/rbrito/usbmount/blob/master/debian/copyright
-set -e
+#set -e
 exec > /dev/null 2>&1
 
 ######################################################################
@@ -106,6 +106,7 @@ if [ "$1" = add ]; then
     if [ $BOOTFW_DEV = /$DEVNAME ]; then
 	log debug "/$DEVNAME contains filesystem type $FSTYPE"
 	log debug "skipping BOOTFS_DEV $BOOTFS_DEV mounted at /boot/firmware"
+	lockfile-remove /var/run/usbmount/.mount
 	exit
     fi
     ROOT_DEV=$(/usr/bin/findmnt -no source /)
@@ -113,12 +114,15 @@ if [ "$1" = add ]; then
     if [ $ROOT_DEV = /$DEVNAME ]; then
 	log debug "/$DEVNAME contains filesystem type $FSTYPE"
 	log debug "skipping ROOT_DEV $ROOT_DEV mounted at /"
+	lockfile-remove /var/run/usbmount/.mount
 	exit
     fi
     BOOT_DEV=$(/usr/bin/findmnt -no source /boot)
     log debug "BOOT_DEV $BOOT_DEV"
     if [ $BOOT_DEV = /$DEVNAME ]; then
-	log debug "skipping BOOTFS_DEV $BOOT_DEV mount as /boot"
+	log debug "/$DEVNAME contains filesystem type $FSTYPE"
+	log debug "skipping BOOT_DEV $BOOT_DEV mount as /boot"
+	lockfile-remove /var/run/usbmount/.mount
 	exit
     fi