[issue35454] Fix miscellaneous issues in error handling

[miss-islington]

Change by miss-islington <mariatta.wijaya+miss-islington at gmail.com>:


----------
pull_requests: +10334

_______________________________________
Python tracker <report at bugs.python.org>
<https://bugs.python.org/issue35454>
_______________________________________