diff --git a/agent/context_references.py b/agent/context_references.py
index eea16ae52b444..d0b2ce0f17b01 100644
--- a/agent/context_references.py
+++ b/agent/context_references.py
@@ -167,9 +167,15 @@ async def preprocess_context_references_async(
                 allowed_root=allowed_root_path,
             )
             for ref in refs
-        )
+        ),
+        return_exceptions=True,
     )
-    for warning, block in expanded:
+    for item in expanded:
+        # Filter out exceptions from return_exceptions=True
+        if isinstance(item, BaseException):
+            warnings.append(f"@ context expansion failed: {item}")
+            continue
+        warning, block = item
         if warning:
             warnings.append(warning)
         if block: