simpler error handling
Merge branch 'offline_map' of https://github.com/mWater/app-v3 into offline_map