changes to stub
fixed error message
Merge branch 'Saumya'