Refactoring, wrapping exceptions.