2 files changed, 3 insertions, 3 deletions
diff --git a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
index 4a29f5f7..5bed3dfc 100644
--- a/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
+++ b/src/buildtool/execution_api/bazel_msg/bazel_msg_factory.cpp
@@ -42,8 +42,8 @@ template <class T>
                                  gsl::narrow<int>(content.size()));
         return content;
     } catch (...) {
+        return std::nullopt;
     }
-    return std::nullopt;
 }
 
 /// \brief Create protobuf message 'Platform'.
diff --git a/src/buildtool/execution_api/common/tree_reader.hpp b/src/buildtool/execution_api/common/tree_reader.hpp
index 857573df..20e73d7d 100644
--- a/src/buildtool/execution_api/common/tree_reader.hpp
+++ b/src/buildtool/execution_api/common/tree_reader.hpp
@@ -102,10 +102,10 @@ class TreeReader final {
                     store, parent, digest, include_trees)) {
                 return result;
             }
+            return std::nullopt;
         } catch (...) {
-            // fallthrough
+            return std::nullopt;
         }
-        return std::nullopt;
     }
 
   private: