removed exception handler