improve some error messages
Merge branch 'master' of github.com:beaumontlab/antonie