Exceptions refactoring 4