diff --git a/lib/spack/spack/main.py b/lib/spack/spack/main.py
index b3e0b8a9719..78c986e0d96 100644
--- a/lib/spack/spack/main.py
+++ b/lib/spack/spack/main.py
@@ -868,7 +868,7 @@ def _main(argv=None):
         bootstrap_context = bootstrap.ensure_bootstrap_configuration()
 
     with bootstrap_context:
-        finish_parse_and_run(parser, cmd_name, env_format_error)
+        return finish_parse_and_run(parser, cmd_name, env_format_error)
 
 
 def finish_parse_and_run(parser, cmd_name, env_format_error):