diff --git a/src/caosdb/configuration.cpp b/src/caosdb/configuration.cpp
index 7d6a6f0c66be8d7ef058a603b8fea7c0da11574a..ed3385a8262107e70b099764cbda6f6065bfaf8b 100644
--- a/src/caosdb/configuration.cpp
+++ b/src/caosdb/configuration.cpp
@@ -508,7 +508,8 @@ auto ConfigurationManager::InitializeDefaults() -> int {
     mLoadSingleJSONConfiguration(*configuration_file_path);
   }
 
-  if (this->json_configuration.as_object().contains("logging")) {
+  if (this->json_configuration.is_object() &&
+      this->json_configuration.as_object().contains("logging")) {
     LoggingConfiguration logging_configuration =
       logging_configuration_helper.CreateLoggingConfiguration(
         json_configuration.at("logging").as_object());
diff --git a/src/caosdb/transaction.cpp b/src/caosdb/transaction.cpp
index 94156745554790ad157d446609865b0e59aafb31..294be0e026185730ad780e1d543bd4d250e413e8 100644
--- a/src/caosdb/transaction.cpp
+++ b/src/caosdb/transaction.cpp
@@ -20,6 +20,7 @@
 #include "caosdb/transaction.h"
 #include "caosdb/entity/v1alpha1/main.grpc.pb.h"  // for EntityTransactionS...
 #include "caosdb/entity/v1alpha1/main.pb.h"       // for RetrieveRequest
+#include "caosdb/status_code.h"                   // for StatusCode, AUTHEN...
 #include "grpcpp/grpcpp.h"                        // for CompletionQueue
 #include "grpcpp/impl/codegen/async_unary_call.h" // for ClientAsyncRespons...
 #include "grpcpp/impl/codegen/client_context.h"   // for ClientContext
@@ -27,7 +28,9 @@
 #include "grpcpp/impl/codegen/status.h"           // for Status
 #include "grpcpp/impl/codegen/status_code_enum.h" // for StatusCode, UNAUTH...
 #include <cassert>                                // for assert
+#include <map>                                    // for map
 #include <memory>                                 // for allocator, unique_ptr
+#include <stdexcept>                              // for out_of_range
 #include <utility>                                // for move
 
 namespace caosdb {