diff --git a/broker/JFJochStateMachine.cpp b/broker/JFJochStateMachine.cpp
index 079e6751..ceee805f 100644
--- a/broker/JFJochStateMachine.cpp
+++ b/broker/JFJochStateMachine.cpp
@@ -285,12 +285,11 @@ void JFJochStateMachine::Initialize() {
     ResetError(); // Clear error, we don't care what was it
 
     logger.Info("Initialize");
+    SetState(JFJochState::Busy, "Configuring indexing threads", BrokerStatus::MessageSeverity::Info);
     try {
         services.SetupIndexing(experiment.GetIndexingSettings());
     } catch (const JFJochException &e) {
-        SetState(JFJochState::Error,
-                 e.what(),
-                 BrokerStatus::MessageSeverity::Error);
+        SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
         throw;
     }
     SetState(JFJochState::Busy, "Configuring detector", BrokerStatus::MessageSeverity::Info);