diff --git a/unraid_mcp/core/exceptions.py b/unraid_mcp/core/exceptions.py
index b63460e..8a174df 100644
--- a/unraid_mcp/core/exceptions.py
+++ b/unraid_mcp/core/exceptions.py
@@ -54,6 +54,8 @@ def tool_error_handler(
         yield
     except ToolError:
         raise
+    except CredentialsNotConfiguredError:
+        raise  # Let callers handle elicitation — do not wrap in ToolError
     except TimeoutError as e:
         logger.exception(
             f"Timeout in unraid_{tool_name} action={action}: request exceeded time limit"