EXCEPTION refactoring