non-functional refactoring: renamed exceptions