Updating exception handling for pre-production