prasita123: Automated cherry pick of #110469: add missing error handling steps

No Results