Better error reporting
Merge branch 'master' of github.com:benjiec/curious