diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0eeead6..9bf0755 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ All notable changes to this project will be documented in this file.
 
 ### What's Changed
 - feat(Get-AdoUser): Add user support (#124)
+- fix(Get-AdoUserEntitlement): Correct error handling (#128)
 
 ### Breaking Changes
 - _None_
diff --git a/src/Azure.DevOps.PSModule/Public/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.ps1 b/src/Azure.DevOps.PSModule/Public/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.ps1
index 921f6da..542f9d1 100644
--- a/src/Azure.DevOps.PSModule/Public/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.ps1
+++ b/src/Azure.DevOps.PSModule/Public/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.ps1
@@ -164,8 +164,8 @@
                 } while ($continuationToken)
 
             } catch {
-                if ($_.ErrorDetails.Message -match 'MemberNotFoundException') {
-                    Write-Warning "Identity not found with ID $UserId, skipping."
+                if ($_.ErrorDetails.Message -match 'UserEntitlementNotFoundException') {
+                    Write-Warning "User entitlement not found for ID $UserId, skipping."
                 } else {
                     throw $_
                 }
diff --git a/src/Azure.DevOps.PSModule/Tests/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.Tests.ps1 b/src/Azure.DevOps.PSModule/Tests/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.Tests.ps1
index 2e5caea..2d32eda 100644
--- a/src/Azure.DevOps.PSModule/Tests/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.Tests.ps1
+++ b/src/Azure.DevOps.PSModule/Tests/MemberEntitlementManagement/UserEntitlements/Get-AdoUserEntitlement.Tests.ps1
@@ -215,10 +215,10 @@ Describe 'Get-AdoUserEntitlement' {
             Mock -ModuleName Azure.DevOps.PSModule Confirm-Default { }
         }
 
-        It 'Should warn when user does not exist (MemberNotFoundException)' {
-            $exception = New-Object System.Management.Automation.RuntimeException('MemberNotFoundException: User not found')
-            $errorRecord = New-Object System.Management.Automation.ErrorRecord($exception, 'UserNotFound', 'ObjectNotFound', $null)
-            $errorRecord.ErrorDetails = New-Object System.Management.Automation.ErrorDetails('MemberNotFoundException: User not found')
+        It 'Should warn when user entitlement does not exist (UserEntitlementNotFoundException)' {
+            $exception = New-Object System.Management.Automation.RuntimeException('UserEntitlementNotFoundException: User entitlement not found')
+            $errorRecord = New-Object System.Management.Automation.ErrorRecord($exception, 'UserEntitlementNotFoundException', 'ObjectNotFound', $null)
+            $errorRecord.ErrorDetails = New-Object System.Management.Automation.ErrorDetails('UserEntitlementNotFoundException: User entitlement not found')
 
             Mock -ModuleName Azure.DevOps.PSModule Invoke-AdoRestMethod { throw $errorRecord }