error handling yelp
Merge branch 'master' of github.com:salilgupta1/OnTheMove