changes for error messages
Merge branch 'Saumya'