diff --git a/pom.xml b/pom.xml
index 4e4e56c..6782445 100755
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
 	<artifactId>lm-lib</artifactId>
 	<groupId>de.extio</groupId>
 	<name>lm-lib</name>
-	<version>1.6.22</version>
+	<version>1.6.23</version>
 	
 	<properties>
 		<java.version>21</java.version>
diff --git a/src/main/java/de/extio/lmlib/agent/BaseAgent.java b/src/main/java/de/extio/lmlib/agent/BaseAgent.java
index 72c1457..a309409 100644
--- a/src/main/java/de/extio/lmlib/agent/BaseAgent.java
+++ b/src/main/java/de/extio/lmlib/agent/BaseAgent.java
@@ -351,9 +351,15 @@ public interface BaseAgent {
 				}
 				
 				case final BaseAgent a when a.agentType(context) == AgentType.CONVERSATION || a.agentType(context) == AgentType.CONVERSATION_WITH_SYSTEM_PROMPT -> {
-					context.getGraph().add("↴");
-					if (context.getConversation().getConversation().getLast().type() != TurnType.ASSISTANT) {
-						context.getConversation().addTurn(new Conversation.Turn(TurnType.ASSISTANT, context.getLastCompletion().response()));
+					if (context.getConversation() == null) {
+						context.getGraph().add("🗨");
+						context.setConversation(null);
+					}
+					else {
+						context.getGraph().add("↴");
+						if (context.getConversation().getConversation().getLast().type() != TurnType.ASSISTANT) {
+							context.getConversation().addTurn(new Conversation.Turn(TurnType.ASSISTANT, context.getLastCompletion().response()));
+						}
 					}
 				}