diff --git a/sdk-server-common/src/main/java/io/a2a/server/requesthandlers/DefaultRequestHandler.java b/sdk-server-common/src/main/java/io/a2a/server/requesthandlers/DefaultRequestHandler.java index 136b9e7c8..ad453f70e 100644 --- a/sdk-server-common/src/main/java/io/a2a/server/requesthandlers/DefaultRequestHandler.java +++ b/sdk-server-common/src/main/java/io/a2a/server/requesthandlers/DefaultRequestHandler.java @@ -162,8 +162,9 @@ public EventKind onMessageSend(MessageSendParams params) throws JSONRPCError { ResultAggregator.EventTypeAndInterrupt etai = null; try { EventConsumer consumer = new EventConsumer(queue); - etai = resultAggregator.consumeAndBreakOnInterrupt(consumer); producerRunnable.addDoneCallback(consumer.createAgentRunnableDoneCallback()); + etai = resultAggregator.consumeAndBreakOnInterrupt(consumer); + if (etai == null) { log.debug("No result, throwing InternalError"); throw new InternalError("No result");