Refactoring - exception wrapping.