Code refactoring : remove exceptions