Could we just use `finally:` instead of catching and re-raising?