From 284b26dc6da6778ee526d2f354499dff9e8529d3 Mon Sep 17 00:00:00 2001 From: Ishaan Jaffer Date: Mon, 23 Mar 2026 12:20:30 -0700 Subject: [PATCH] fix(mcp): return 404 when edit_mcp_toolset target does not exist --- .../proxy/management_endpoints/mcp_management_endpoints.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/litellm/proxy/management_endpoints/mcp_management_endpoints.py b/litellm/proxy/management_endpoints/mcp_management_endpoints.py index ae6f0ae86d2..3c32df966a6 100644 --- a/litellm/proxy/management_endpoints/mcp_management_endpoints.py +++ b/litellm/proxy/management_endpoints/mcp_management_endpoints.py @@ -2166,6 +2166,11 @@ if MCP_AVAILABLE: litellm_changed_by or user_api_key_dict.user_id or LITELLM_PROXY_ADMIN_NAME ) result = await update_mcp_toolset(prisma_client, payload, touched_by) + if result is None: + raise HTTPException( + status_code=status.HTTP_404_NOT_FOUND, + detail={"error": f"Toolset '{payload.toolset_id}' not found."}, + ) from litellm.proxy._experimental.mcp_server.mcp_server_manager import ( global_mcp_server_manager, )