Update exception handling for 3dd6c23