diff --git a/mpsd-software.py b/mpsd-software.py
index b1ca8c7a080c5489bcab7ba2de1b50a3bbaae030..8c0172abea8ad943ff79ab3ca606bb154ee64970 100755
--- a/mpsd-software.py
+++ b/mpsd-software.py
@@ -1125,6 +1125,14 @@ def main():
         get_installer_log_file_path(args.release, args.action, root_dir),
     )
 
+    # sanity check for common mistakes in command line arguments
+    if args.release.endswith("/"):  # happens easily with autocompletion
+        logging.error(
+            f"You provided mpsd-release='{args.release}'. "
+            "Did you mean '{args.release.rstrip('/')}'?"
+        )
+        sys.exit(1)
+
     # Check the command and run related function
     if args.action == "remove":
         remove_environment(args.release, args.toolchains, root_dir)