Merge pull request #17044 from yashodha/error