moby: error handling
Merge branch 'master' into beta