Added Error Messages
merge w/ Hiral's branch