Exceptions refactored...