Codereview: Refactored Exception Handling