diff --git a/llama_stack/cli/stack/build.py b/llama_stack/cli/stack/build.py
index f787b1a8e..faaf199f4 100644
--- a/llama_stack/cli/stack/build.py
+++ b/llama_stack/cli/stack/build.py
@@ -112,7 +112,9 @@ class StackBuild(Subcommand):
             to_write = json.loads(json.dumps(build_config.dict(), cls=EnumEncoder))
             f.write(yaml.dump(to_write, sort_keys=False))
 
-        build_image(build_config, build_file_path)
+        return_code = build_image(build_config, build_file_path)
+        if return_code != 0:
+            return
 
         cprint(
             f"Build spec configuration saved at {str(build_file_path)}",
diff --git a/llama_stack/distribution/build.py b/llama_stack/distribution/build.py
index 95cea6caa..e38f1af1a 100644
--- a/llama_stack/distribution/build.py
+++ b/llama_stack/distribution/build.py
@@ -93,4 +93,5 @@ def build_image(build_config: BuildConfig, build_file_path: Path):
             f"Failed to build target {build_config.name} with return code {return_code}",
             color="red",
         )
-        return
+    
+    return return_code