diff --git a/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt b/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt
index 6933fb16375bdd98559d8d0c03711df1c93b2b62..70e30cf84ef40796eb085a0d68eb2e323232fde9 100644
--- a/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt
+++ b/theodolite/src/main/kotlin/theodolite/execution/operator/TheodoliteController.kt
@@ -72,8 +72,8 @@ class TheodoliteController(
         try {
             val modifier = ConfigOverrideModifier(
             execution = execution,
-            resources = benchmark.loadKubernetesResources(benchmark.sut.resources !!).map { it.first }
-                    + benchmark.loadKubernetesResources(benchmark.loadGenerator.resources !!).map { it.first }
+            resources = benchmark.loadKubernetesResources(benchmark.sut.resources).map { it.first }
+                    + benchmark.loadKubernetesResources(benchmark.loadGenerator.resources).map { it.first }
         )
         modifier.setAdditionalLabels(
             labelValue = execution.name,
@@ -186,7 +186,6 @@ class TheodoliteController(
         benchmarkStateHandler.setResourceSetState(resource.spec.name, state)
     }
 
-    // TODO(Should we check, if actions could be performed or not (all pods are up and running...))?
     private fun checkResource(benchmark: KubernetesBenchmark): BenchmarkStates {
         return try {
             val appResources =