diff --git a/crates/agent/src/tools/context_server_registry.rs b/crates/agent/src/tools/context_server_registry.rs
index 12ad642cfca6d87aa29f219951e45d402d98943d..c7aa697ed6c5dc9eb176e154243fbed61aa2eb3b 100644
--- a/crates/agent/src/tools/context_server_registry.rs
+++ b/crates/agent/src/tools/context_server_registry.rs
@@ -380,6 +380,12 @@ impl AnyAgentTool for ContextServerTool {
                 }
             };
 
+            if response.is_error == Some(true) {
+                let error_message: String =
+                    response.content.iter().filter_map(|c| c.text()).collect();
+                anyhow::bail!(error_message);
+            }
+
             let mut result = String::new();
             for content in response.content {
                 match content {