diff --git a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
index 01ed386ac1af8d78aeeea6e79ca0dee3b2020dc7..5fd2eedecdc42b575d69760025a31f45eb71fec0 100644
--- a/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
+++ b/theodolite-quarkus/src/main/kotlin/theodolite/execution/TheodoliteExecutor.kt
@@ -102,25 +102,22 @@ class TheodoliteExecutor(
     }
 
     private fun getResultFolderString(): String {
-        var resultsFolder: String = System.getenv("RESULTS_FOLDER")
+        var resultsFolder: String = System.getenv("RESULTS_FOLDER") ?: ""
         val createResultsFolder = System.getenv("CREATE_RESULTS_FOLDER") ?: "false"
 
-        logger.info { "RESULT_FOLDER: $resultsFolder" }
-
-        if (resultsFolder.isNotEmpty()){
-            resultsFolder += "/"
-        }
-
-        val directory = File(resultsFolder)
-        if (!directory.exists()) {
-            logger.error { "Folder $resultsFolder does not exist" }
-            if (createResultsFolder.toBoolean()) {
-                directory.mkdirs()
-            } else {
-                throw IllegalArgumentException("Result folder not found")
+        if (resultsFolder != ""){
+            logger.info { "RESULT_FOLDER: $resultsFolder" }
+            val directory = File(resultsFolder)
+            if (!directory.exists()) {
+                logger.error { "Folder $resultsFolder does not exist" }
+                if (createResultsFolder.toBoolean()) {
+                    directory.mkdirs()
+                } else {
+                    throw IllegalArgumentException("Result folder not found")
+                }
             }
+            resultsFolder += "/"
         }
-        logger.info { "RESULT_FOLDER: $resultsFolder" }
         return  resultsFolder
     }