Improve error message for TenantMismatchError#1737
Merged
anannya03 merged 6 commits intomicrosoft:mainfrom Feb 18, 2026
Merged
Conversation
anannya03
requested review from
Copilot,
fanyang-mono,
jongio,
joshfree,
msalaman,
saikoumudi,
sandeep-sen and
xiangyan99
Contributor
There was a problem hiding this comment.
Pull request overview
This PR improves the error message displayed when users encounter tenant mismatch authentication errors in the Azure MCP Server. The change addresses issue #1706 where users receive cryptic error messages when their authentication token is from a different Azure tenant than the one required by their subscription.
Changes:
- Added a new
HandleRequestFailedExceptionmethod toGlobalCommandthat detects tenant mismatch errors (401 status with "InvalidAuthenticationTokenTenant" in the message) and provides a more helpful, actionable error message - The improved error message guides users to either specify the target tenant in their prompt or configure the
AZURE_TOKEN_CREDENTIALSenvironment variable
g2vinay
reviewed
Feb 17, 2026
g2vinay
reviewed
Feb 18, 2026
g2vinay
approved these changes
Feb 18, 2026
colbytimm
pushed a commit
to colbytimm/microsoft-mcp
that referenced
this pull request
Apr 20, 2026
* Improve error message for tenantMismatchError * added null check * dotnet format * modified the error message * dotnet format * changelog
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
What does this PR do?
Improve error message for TenantMismatchError.
GitHub issue number?
#1706