diff --git a/pkg/engine/engine.go b/pkg/engine/engine.go
index d71951fa..da3395cb 100644
--- a/pkg/engine/engine.go
+++ b/pkg/engine/engine.go
@@ -335,15 +335,14 @@ func (e *Engine) Continue(ctx Context, state *State, results ...CallResult) (*Re
 	}
 
 	for _, result := range results {
-		if result.CallID != "" {
-			state.Results[result.CallID] = result
-		}
-		if result.User != "" {
+		if result.CallID == "" {
 			added = true
 			state.Completion.Messages = append(state.Completion.Messages, types.CompletionMessage{
 				Role:    types.CompletionMessageRoleTypeUser,
 				Content: types.Text(result.User),
 			})
+		} else {
+			state.Results[result.CallID] = result
 		}
 	}
 
diff --git a/pkg/openai/client.go b/pkg/openai/client.go
index 6cf9f41b..ecae7016 100644
--- a/pkg/openai/client.go
+++ b/pkg/openai/client.go
@@ -304,7 +304,7 @@ func (c *Client) Call(ctx context.Context, messageRequest types.CompletionReques
 	}
 
 	if len(msgs) == 0 {
-		return nil, fmt.Errorf("invalid request, no messages to send to OpenAI")
+		return nil, fmt.Errorf("invalid request, no messages to send to LLM")
 	}
 
 	request := openai.ChatCompletionRequest{