Merge pull request #12660 from pradpnayak/report-error