diff --git a/broker/JFJochBrokerHttp.cpp b/broker/JFJochBrokerHttp.cpp
index 012a583b..3acd9d14 100644
--- a/broker/JFJochBrokerHttp.cpp
+++ b/broker/JFJochBrokerHttp.cpp
@@ -79,8 +79,7 @@ void JFJochBrokerHttp::wait_till_done_post(const std::optional<int32_t> &timeout
             response.send(Pistache::Http::Code::Bad_Gateway);
             break;
         case JFJochState::Error:
-            response.send(Pistache::Http::Code::Internal_Server_Error);
-            break;
+            throw WrongDAQStateException("Detector in error state");
         case JFJochState::Measuring:
         case JFJochState::Busy:
         case JFJochState::Pedestal:
diff --git a/tests/ModuleSummationTest.cpp b/tests/ModuleSummationTest.cpp
index 8709df16..df9d4081 100644
--- a/tests/ModuleSummationTest.cpp
+++ b/tests/ModuleSummationTest.cpp
@@ -3,7 +3,6 @@
 
 #include <catch2/catch_all.hpp>
 #include "../common/ModuleSummation.h"
-#include "ffbidx/c_api.h"
 
 TEST_CASE("ModuleSummation_signed") {
     constexpr size_t nsummation = 27;