Reviewed all choices for Exception types. Realised this whole package needs a review and in some parts a refactor.