diff --git a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/AbstractWorkloadGenerator.java b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/AbstractWorkloadGenerator.java
index f7ec7c417cd5af21bf05ca646653976f404afaad..17aa9871ddfa952b65fa908fd6008af004b0c938 100644
--- a/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/AbstractWorkloadGenerator.java
+++ b/workload-generator-commons/src/main/java/theodolite/commons/workloadgeneration/generators/AbstractWorkloadGenerator.java
@@ -117,8 +117,8 @@ public abstract class AbstractWorkloadGenerator<T extends IMonitoringRecord>
         LOGGER.info("Terminating now...");
         this.stop();
       } catch (final InterruptedException e) {
-        // TODO Auto-generated catch block
-        e.printStackTrace();
+        LOGGER.error("", e);
+        throw new IllegalStateException("Error when terminating the workload generation.");
       }
     };