Update to handle errors
Merge branch 'master' of https://github.com/botcar/botcar-apps