Refactored methods with incorrect exception handling