#559 | Jaideep | Error messages consistency fix