[8.15](backport #5329) Fixes issue where context cancelling could result in an invalid error being reported

[8.15](backport #5329) Fixes issue where context cancelling could result in an invalid error being reported #11583