diff --git a/autogpt_platform/backend/backend/blocks/mcp/client.py b/autogpt_platform/backend/backend/blocks/mcp/client.py
index 0d7860132e..65e4175ad9 100644
--- a/autogpt_platform/backend/backend/blocks/mcp/client.py
+++ b/autogpt_platform/backend/backend/blocks/mcp/client.py
@@ -139,7 +139,7 @@ class MCPClient:
         else:
             try:
                 body = response.json()
-            except (ValueError, Exception) as e:
+            except Exception as e:
                 raise MCPClientError(
                     f"MCP server returned non-JSON response: {e}"
                 ) from e
diff --git a/autogpt_platform/backend/backend/blocks/mcp/oauth.py b/autogpt_platform/backend/backend/blocks/mcp/oauth.py
index 72c6cd39b2..8cce1099e5 100644
--- a/autogpt_platform/backend/backend/blocks/mcp/oauth.py
+++ b/autogpt_platform/backend/backend/blocks/mcp/oauth.py
@@ -167,7 +167,7 @@ class MCPOAuthHandler(BaseOAuthHandler):
             title=credentials.title,
             access_token=SecretStr(tokens["access_token"]),
             refresh_token=(
-                SecretStr(str(tokens["refresh_token"]))
+                SecretStr(tokens["refresh_token"])
                 if tokens.get("refresh_token")
                 else credentials.refresh_token
             ),