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 30620b5..b1e28c3 100644
--- a/src/main/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandler.java
+++ b/src/main/java/de/extio/lmlib/agent/responsehandler/CsvAgentResponseHandler.java
@@ -27,7 +27,7 @@ public class CsvAgentResponseHandler implements StreamedAgentResponseHandler {
 	
 	private final String fieldSeparatorQuoted;
 	
-	private final String errorPromptSuffix;
+	private final String errorPrompt;
 
 	private final String reasoningKey;
 
@@ -52,9 +52,9 @@ public class CsvAgentResponseHandler implements StreamedAgentResponseHandler {
 		this.reasoningKey = this.keyPrefix + "_reasoning";
 		this.afterChunkUpdate = afterChunkUpdate;
 		
-		this.errorPromptSuffix = "\n\nThe previous response could not be fully processed or validated. " +
+		this.errorPrompt = "\n\nThe previous response could not be fully processed or validated. " +
 				"Please format the response as CSV with '" + fieldSeparator + "' as field separator.\n" +
-				"Expected columns: " + String.join(", ", headings) + " \nOne row per line.";
+				"Expected columns: " + String.join(this.fieldSeparator, headings) + " \nOne row per line.";
 	}
 	
 	@Override
@@ -69,7 +69,7 @@ public class CsvAgentResponseHandler implements StreamedAgentResponseHandler {
 			final boolean success = this.parseCsv(resp, context);
 			if (!success) {
 				LOGGER.warn("No valid CSV data parsed from response");
-				this.addCsvResponseErrorPrompt(context);
+				this.addCsvResponseErrorPrompt(context, resp);
 				return false;
 			}
 			
@@ -77,7 +77,7 @@ public class CsvAgentResponseHandler implements StreamedAgentResponseHandler {
 		}
 		catch (final Exception ex) {
 			LOGGER.warn("Failed to parse CSV response", ex);
-			this.addCsvResponseErrorPrompt(context);
+			this.addCsvResponseErrorPrompt(context, resp);
 			return false;
 		}
 	}
@@ -185,11 +185,17 @@ public class CsvAgentResponseHandler implements StreamedAgentResponseHandler {
 		return true;
 	}
 	
-	private void addCsvResponseErrorPrompt(final AgentContext context) {
-		final var turn = context.getConversation().getConversation().getLast();
-		context.getConversation().replaceTurn(new Conversation.Turn(
-				turn.type(),
-				turn.text() + this.errorPromptSuffix));
+	private void addCsvResponseErrorPrompt(final AgentContext context, final String csvResponse) {
+		// final var turn = context.getConversation().getConversation().getLast();
+		// context.getConversation().replaceTurn(new Conversation.Turn(
+		// 		turn.type(),
+		// 		turn.text() + this.errorPromptSuffix));
+		context.getConversation().addTurn(new Conversation.Turn(
+				Conversation.TurnType.ASSISTANT,
+				csvResponse != null ? csvResponse : ""));
+		context.getConversation().addTurn(new Conversation.Turn(
+				Conversation.TurnType.USER,
+				this.errorPrompt));
 	}
 	
 	private String stripQuotes(final String value) {
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 f3ec483..639193c 100644
--- a/src/main/java/de/extio/lmlib/agent/responsehandler/CsvUnmarshallingAgentResponseHandler.java
+++ b/src/main/java/de/extio/lmlib/agent/responsehandler/CsvUnmarshallingAgentResponseHandler.java
@@ -39,7 +39,7 @@ public class CsvUnmarshallingAgentResponseHandler implements AgentResponseHandle
 	
 	private final String listSeparatorQuoted;
 	
-	private final String errorPromptSuffix;
+	private final String errorPrompt;
 	
 	public CsvUnmarshallingAgentResponseHandler(final Class<?> targetClass, final String contextKey) {
 		this(targetClass, contextKey, ";", ",");
@@ -70,7 +70,7 @@ public class CsvUnmarshallingAgentResponseHandler implements AgentResponseHandle
 		final String listInfo = (listSeparator != null && !listSeparator.isEmpty())
 				? " and '" + listSeparator + "' for list items"
 				: "";
-		this.errorPromptSuffix = "\n\nThe previous response could not be fully processed or validated. " +
+		this.errorPrompt = "\n\nThe previous response could not be fully processed or validated. " +
 				"Please format the response as CSV with '" + fieldSeparator + "' as field separator" +
 				listInfo + ". One object per line.";
 	}
@@ -97,7 +97,7 @@ public class CsvUnmarshallingAgentResponseHandler implements AgentResponseHandle
 			final List<Object> parsedObjects = this.parseCsv(resp);
 			if (parsedObjects.isEmpty()) {
 				LOGGER.warn("No valid CSV data parsed from response");
-				this.addCsvResponseErrorPrompt(context);
+				this.addCsvResponseErrorPrompt(context, resp);
 				return false;
 			}
 			
@@ -107,7 +107,7 @@ public class CsvUnmarshallingAgentResponseHandler implements AgentResponseHandle
 		}
 		catch (final Exception ex) {
 			LOGGER.warn("Failed to parse CSV response", ex);
-			this.addCsvResponseErrorPrompt(context);
+			this.addCsvResponseErrorPrompt(context, resp);
 			return false;
 		}
 	}
@@ -253,11 +253,17 @@ public class CsvUnmarshallingAgentResponseHandler implements AgentResponseHandle
 		throw new IllegalArgumentException("Unsupported field type: " + fieldType.getName());
 	}
 	
-	private void addCsvResponseErrorPrompt(final AgentContext context) {
-		final var turn = context.getConversation().getConversation().getLast();
-		context.getConversation().replaceTurn(new Conversation.Turn(
-				turn.type(),
-				turn.text() + this.errorPromptSuffix));
+	private void addCsvResponseErrorPrompt(final AgentContext context, final String csvResponse) {
+		// final var turn = context.getConversation().getConversation().getLast();
+		// context.getConversation().replaceTurn(new Conversation.Turn(
+		// 		turn.type(),
+		// 		turn.text() + this.errorPromptSuffix));
+		context.getConversation().addTurn(new Conversation.Turn(
+			Conversation.TurnType.ASSISTANT,
+			csvResponse != null ? csvResponse : ""));
+		context.getConversation().addTurn(new Conversation.Turn(
+				Conversation.TurnType.USER,
+				this.errorPrompt));
 	}
 	
 	private String stripQuotes(final String value) {
diff --git a/src/main/java/de/extio/lmlib/agent/responsehandler/JsonAgentResponseHandler.java b/src/main/java/de/extio/lmlib/agent/responsehandler/JsonAgentResponseHandler.java
index 2d30bbb..c1f91cf 100755
--- a/src/main/java/de/extio/lmlib/agent/responsehandler/JsonAgentResponseHandler.java
+++ b/src/main/java/de/extio/lmlib/agent/responsehandler/JsonAgentResponseHandler.java
@@ -107,7 +107,7 @@ public class JsonAgentResponseHandler implements StreamedAgentResponseHandler {
 			}
 			catch (final Exception e2) {
 				LOGGER.warn("Cannot parse json response even after sanitization: {}", completion.response());
-				addJsonResponseErrorPrompt(context);
+				addJsonResponseErrorPrompt(context, completion.response());
 				return false;
 			}
 		}
@@ -153,9 +153,15 @@ public class JsonAgentResponseHandler implements StreamedAgentResponseHandler {
 		}
 	}
 	
-	private void addJsonResponseErrorPrompt(final AgentContext context) {
-		final var turn = context.getConversation().getConversation().getLast();
-		context.getConversation().replaceTurn(new Conversation.Turn(turn.type(), turn.text() + "\n\nThe previous response could not be fully processed or validated. Please make sure to format the response in valid JSON syntax with properly escaped characters."));
+	private void addJsonResponseErrorPrompt(final AgentContext context, final String jsonResponse) {
+		// final var turn = context.getConversation().getConversation().getLast();
+		// context.getConversation().replaceTurn(new Conversation.Turn(turn.type(), turn.text() + "\n\nThe previous response could not be fully processed or validated. Please make sure to format the response in valid JSON structure with properly escaped characters."));
+		context.getConversation().addTurn(new Conversation.Turn(
+			Conversation.TurnType.ASSISTANT,
+			jsonResponse != null ? jsonResponse : ""));
+		context.getConversation().addTurn(new Conversation.Turn(
+				Conversation.TurnType.USER,
+				"The previous response could not be fully processed or validated. Please make sure to format the response in valid JSON structure with properly escaped characters."));
 	}
 	
 	private String sanitizeJson(final String json) {