2 files changed, 3 insertions, 2 deletions
diff --git a/src/buildtool/execution_api/local/local_response.hpp b/src/buildtool/execution_api/local/local_response.hpp
index 852284b7..790bb384 100644
--- a/src/buildtool/execution_api/local/local_response.hpp
+++ b/src/buildtool/execution_api/local/local_response.hpp
@@ -144,7 +144,6 @@ class LocalResponse final : public IExecutionResponse {
         if (populated_) {
             return std::nullopt;
         }
-        populated_ = true;
 
         ArtifactInfos artifacts{};
         auto const& action_result = output_.action;
@@ -276,6 +275,7 @@ class LocalResponse final : public IExecutionResponse {
         }
         artifacts_ = std::move(artifacts);
         dir_symlinks_ = std::move(dir_symlinks);
+        populated_ = true;
         return std::nullopt;
     }
 
diff --git a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
index cedc1ff4..81392813 100644
--- a/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
+++ b/src/buildtool/execution_api/remote/bazel/bazel_response.cpp
@@ -97,7 +97,6 @@ auto BazelResponse::Populate() noexcept -> std::optional<std::string> {
     if (populated_) {
         return std::nullopt;
     }
-    populated_ = true;
 
     ArtifactInfos artifacts{};
     auto const& action_result = output_.action_result;
@@ -215,6 +214,7 @@ auto BazelResponse::Populate() noexcept -> std::optional<std::string> {
         }
         artifacts_ = std::move(artifacts);
         dir_symlinks_ = std::move(dir_symlinks);
+        populated_ = true;
         return std::nullopt;
     }
 
@@ -272,6 +272,7 @@ auto BazelResponse::Populate() noexcept -> std::optional<std::string> {
     }
     artifacts_ = std::move(artifacts);
     dir_symlinks_ = std::move(dir_symlinks);
+    populated_ = true;
     return std::nullopt;
 }