error checking.
merge between praveen's and my changes

Merge branch 'master' of https://github.com/anupamme/NaturalHotel