Fix exception handling on GCP-7192 cases