Merge pull request #12003 from mshabunin:avi-error-messages