made messages and error messages changes
Authored by: samantprajakta 2013-06-26
Parent: [r928]
Child: [r930]