1 files changed, 2 insertions, 1 deletions
diff --git a/src/buildtool/execution_engine/executor/executor.hpp b/src/buildtool/execution_engine/executor/executor.hpp
index 060370fb..e5dcc5a9 100644
--- a/src/buildtool/execution_engine/executor/executor.hpp
+++ b/src/buildtool/execution_engine/executor/executor.hpp
@@ -238,7 +238,8 @@ class ExecutorImpl {
             if (auto it = entry_map.find(digest); it != entry_map.end()) {
                 auto const& entry = it->second;
                 if (entry->IsTree()) {
-                    if (not VerifyOrUploadTree(api, *entry->Tree())) {
+                    auto const& tree = entry->Tree();
+                    if (not tree or not VerifyOrUploadTree(api, *tree)) {
                         return false;
                     }
                 }