[unrelated] Fix invalid exception returns
3 files changed