Changed error messages as per nishals request