diff --git a/releng/manual_devices_ts b/releng/manual_devices_ts
index 7d6f1b88..d5bf5492 100755
--- a/releng/manual_devices_ts
+++ b/releng/manual_devices_ts
@@ -156,6 +156,14 @@ fi
 case ${RET} in
      0)
       get_devices "$devices" "$dev"
+      RET="$?"
+      if test "$RET" = 0
+      then
+           dummy=dummy
+      else
+           echo "FAIL : ${SELF} : Device scan or single drive listing failed"
+           exit "$RET"
+      fi
      ;;
      *)
       boldify