Error cleanup. Closes 1139.
Merge branch 'master' of github.com:spumko/hapi