update the fix with improved catch block for issue - CARBON-14947