forgot exceptions during refactoring