Improve error messages of the following error classes:
[Github] Pull Request #36428 (MaxGekk)
[Github] Pull Request #36439 (MaxGekk)