From 5275922d1da971ace525d091723e0544f65e5ecd Mon Sep 17 00:00:00 2001
From: Dai Ha <dai.ha@magnolia-cms.com>
Date: Sat, 15 Aug 2026 06:22:22 +0200
Subject: [PATCH] CB-577: handle questions without async waiters

---
 bridged/src/main/java/dev/ltms/bridged/msg/MessageService.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bridged/src/main/java/dev/ltms/bridged/msg/MessageService.java b/bridged/src/main/java/dev/ltms/bridged/msg/MessageService.java
index cc99ff4..024e274 100644
--- a/bridged/src/main/java/dev/ltms/bridged/msg/MessageService.java
+++ b/bridged/src/main/java/dev/ltms/bridged/msg/MessageService.java
@@ -625,7 +625,7 @@ public final class MessageService {
 
     /** Record the active question for an async ticket; blocking sends have no entry and stay unchanged. */
     private Task markAsyncQuestion(CompletableFuture<Rendezvous.Resolution> waiter, String text, String turnId) {
-        Task task = asyncTasksByWaiter.get(waiter);
+        Task task = waiter == null ? null : asyncTasksByWaiter.get(waiter);
         if (task != null) {
             task.question = new Reply(Outcome.QUESTION, text, turnId);
             task.turnId = turnId;