Error messages added. Pls check