diff --git a/csaxs_bec/devices/jungfraujoch/eiger.py b/csaxs_bec/devices/jungfraujoch/eiger.py
index 330c39f..042da1c 100644
--- a/csaxs_bec/devices/jungfraujoch/eiger.py
+++ b/csaxs_bec/devices/jungfraujoch/eiger.py
@@ -386,12 +386,12 @@ class Eiger(PSIDeviceBase):
                             f"JungfrauJoch broker status: {yaml.dump(broker_status.to_dict(), indent=4)}"
                         )
                     if broker_status.message_severity == "error":  # Raise on error
-                        # raise EigerError(
-                        #     f"Device {self.name} acquisition completed with error status from JungfrauJoch broker: {yaml.dump(broker_status.to_dict(), indent=4)}"
-                        # )
-                        logger.warning(
+                        raise EigerError(
                             f"Device {self.name} acquisition completed with error status from JungfrauJoch broker: {yaml.dump(broker_status.to_dict(), indent=4)}"
                         )
+                        # logger.warning(
+                        #     f"Device {self.name} acquisition completed with error status from JungfrauJoch broker: {yaml.dump(broker_status.to_dict(), indent=4)}"
+                        # )
                     # Call API endpoint to get statistics
                     statistics: MeasurementStatistics = (
                         self.jfj_client.api.statistics_data_collection_get(_request_timeout=5)