diff --git a/src/main/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandler.java b/src/main/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandler.java
index b1e28c3..45cd555 100644
--- a/src/main/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandler.java
+++ b/src/main/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandler.java
@@ -3,8 +3,8 @@ package de.extio.lmlib.agent.responsehandler;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
-import java.util.regex.Pattern;
 import java.util.function.BiConsumer;
+import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -62,7 +62,7 @@ public class CsvAgentResponseHandler implements StreamedAgentResponseHandler {
 		final String resp = completion.response();
 		if (resp == null || resp.isBlank()) {
 			LOGGER.warn("Empty completion response for CSV parsing");
-			return false;
+			return true;
 		}
 		
 		try {
diff --git a/src/main/java/de/extio/lmlib/agent/responsehandler/CsvUnmarshallingAgentResponseHandler.java b/src/main/java/de/extio/lmlib/agent/responsehandler/CsvUnmarshallingAgentResponseHandler.java
index 639193c..d367071 100644
--- a/src/main/java/de/extio/lmlib/agent/responsehandler/CsvUnmarshallingAgentResponseHandler.java
+++ b/src/main/java/de/extio/lmlib/agent/responsehandler/CsvUnmarshallingAgentResponseHandler.java
@@ -90,7 +90,7 @@ public class CsvUnmarshallingAgentResponseHandler implements AgentResponseHandle
 		final String resp = completion.response();
 		if (resp == null || resp.isBlank()) {
 			LOGGER.warn("Empty completion response for CSV parsing");
-			return false;
+			return true;
 		}
 		
 		try {
diff --git a/src/test/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandlerTest.java b/src/test/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandlerTest.java
index 73151ad..b800f37 100644
--- a/src/test/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandlerTest.java
+++ b/src/test/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandlerTest.java
@@ -235,7 +235,9 @@ public class CsvAgentResponseHandlerTest {
 		final Completion completion = new Completion("", null, null, null);
 		final boolean result = handler.handle(completion, context);
 		
-		assertFalse(result);
+		assertTrue(result);
+		assertTrue(context.getStringValues("empty_a") == null || context.getStringValues("empty_a").isEmpty());
+		assertTrue(context.getStringValues("empty_b") == null || context.getStringValues("empty_b").isEmpty());
 	}
 	
 	@Test
@@ -247,7 +249,9 @@ public class CsvAgentResponseHandlerTest {
 		final Completion completion = new Completion(null, null, null, null);
 		final boolean result = handler.handle(completion, context);
 		
-		assertFalse(result);
+		assertTrue(result);
+		assertTrue(context.getStringValues("null_a") == null || context.getStringValues("null_a").isEmpty());
+		assertTrue(context.getStringValues("null_b") == null || context.getStringValues("null_b").isEmpty());
 	}
 	
 	@Test