diff --git a/src/mpsd_software_manager/mpsd_software.py b/src/mpsd_software_manager/mpsd_software.py
index 5f53ed1a5123624a7ed13951fed5a6cbbbe825c4..bbc22eeb1861a49ba10ef716ed0cec7e228ae3f1 100755
--- a/src/mpsd_software_manager/mpsd_software.py
+++ b/src/mpsd_software_manager/mpsd_software.py
@@ -1096,7 +1096,7 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
         logging.warning(
             "Please specify package_sets to remove, or 'ALL' to remove all toolchains"
         )
-        sys.exit(1)
+        sys.exit(50)  # TODO document this code.
     # 2nd case: remove the entire release for microarchitecture
     dir_to_remove = root_dir / mpsd_release / get_native_microarchitecture()
     if "ALL" in package_sets:
@@ -1108,7 +1108,7 @@ def remove_environment(mpsd_release, root_dir, package_sets="NONE", force_remove
         if not force_remove:
             logging.warning("do you want to continue? [y/n]")
             if input().lower() != "y":
-                sys.exit(50)  # TODO document this code.
+                sys.exit(60)  # TODO document this code.
 
         folders_to_remove = os.listdir(dir_to_remove)
         # skip logs folder