Catch InvocationTargetException and throw its cause instead, except when the cause is not an instance of Exception.
Changed paths: