Better error handling when the API fails.
Merge branch 'dev' of https://github.com/oSoc13/Cityroute into dev