`Exception` should also be avoided since it catches all, and sometimes that can swallow useful informations which is being triggered somewhere else.

Here's my proposed enhancement to your fix #6308