diff --git a/include/caosdb/transaction.h b/include/caosdb/transaction.h
index a873a93bec97e0a47d87692327e0d23662b5a1e7..3d394a1d1b37ffb980852cb5ff5400c96915a62b 100644
--- a/include/caosdb/transaction.h
+++ b/include/caosdb/transaction.h
@@ -36,7 +36,6 @@
 #include <iterator>                         // for iterator, next
 #include <map>                              // for map
 #include <memory>                           // for unique_ptr
-#include <stdexcept>                        // for out_of_range
 #include <string>                           // for string
 #include <utility>                          // for move
 #include <vector>                           // for vector
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index af6c0f7dcc4be48a6d399cdc0eb62af82da4fd75..bc4b4d6b8fda91268a2303c47c4278f859af1070 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -465,13 +465,14 @@ auto Transaction::WaitForIt() const noexcept -> TransactionStatus {
         this->query_count = retrieve_response->count_result();
       } break;
       case RetrieveResponseCase::kFindResult: {
+        std::unique_ptr<Entity> find_result;
         for (auto &entity_response :
              *retrieve_response->mutable_find_result()->mutable_result_set()) {
-          result = std::make_unique<Entity>(&entity_response);
-          if (result->HasErrors()) {
+          find_result = std::make_unique<Entity>(&entity_response);
+          if (find_result->HasErrors()) {
             set_error = true;
           }
-          entities.push_back(std::move(result));
+          entities.push_back(std::move(find_result));
         }
       } break;
       default: