Handle exceptions in ride sync more gracefully
Merge branch 'master' of https://github.com/hozn/bafs