diff --git a/slsReceiverSoftware/src/DataProcessor.cpp b/slsReceiverSoftware/src/DataProcessor.cpp
index 710875496..cfad27a3d 100644
--- a/slsReceiverSoftware/src/DataProcessor.cpp
+++ b/slsReceiverSoftware/src/DataProcessor.cpp
@@ -295,7 +295,9 @@ void DataProcessor::ThreadExecution() {
                        memImage->data);
     } catch (const std::exception &e) {
         fifo->FreeAddress(buffer);
-        return;
+        LOG(logERROR) << "DataProcessor " << index << ": Failed to Process. "
+                      << e.what() << std::endl;
+        throw RuntimeError(e.what());
     }
 
     // stream (if time/freq to stream) or free
diff --git a/slsReceiverSoftware/src/GeneralData.h b/slsReceiverSoftware/src/GeneralData.h
index 6657630cc..7147d0e2c 100644
--- a/slsReceiverSoftware/src/GeneralData.h
+++ b/slsReceiverSoftware/src/GeneralData.h
@@ -52,7 +52,7 @@ class GeneralData {
     uint32_t nAnalogSamples{0};
     uint32_t nDigitalSamples{0};
     uint32_t nTransceiverSamples{0};
-    std::vector<int> ctbDbitList;
+    std::vector<int> ctbDbitList{};
     int ctbDbitOffset{0};
     bool ctbDbitReorder{false};
     slsDetectorDefs::readoutMode readoutType{slsDetectorDefs::ANALOG_ONLY};
diff --git a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp
index df87f392f..7ad93b908 100644
--- a/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp
+++ b/slsReceiverSoftware/tests/test-ArrangeDataBasedOnBitList.cpp
@@ -73,8 +73,6 @@ class DataProcessorTestFixture {
         dataprocessor = new DataProcessorTest;
         generaldata = new GeneralDataTest;
 
-        // set_num_samples(num_samples);
-
         generaldata->SetNumberOfAnalogDatabytes(num_analog_bytes);
         generaldata->SetNumberOfTransceiverDatabytes(num_transceiver_bytes);
         generaldata->SetNumberOfDigitalDatabytes(num_digital_bytes +