diff --git a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java b/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
index c912854b2..2f26e9768 100644
--- a/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
+++ b/spring-ai-core/src/main/java/org/springframework/ai/evaluation/RelevancyEvaluator.java
@@ -5,6 +5,7 @@ import org.springframework.ai.model.Content;
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 public class RelevancyEvaluator implements Evaluator {
@@ -54,12 +55,12 @@ public class RelevancyEvaluator implements Evaluator {
 
 	protected String doGetSupportingData(EvaluationRequest evaluationRequest) {
 		List<Content> data = evaluationRequest.getDataList();
-		String supportingData = data.stream()
-			.filter(node -> node != null && node.getContent() instanceof String)
-			.map(node -> (Content) node)
+		return data.stream()
 			.map(Content::getContent)
+			.filter(Objects::nonNull)
+			.filter(c -> c instanceof String)
+			.map(Object::toString)
 			.collect(Collectors.joining(System.lineSeparator()));
-		return supportingData;
 	}
 
 }