Improves error message handling
Merge branch 'master' of https://github.com/lca4/unison-android