Error message update
Merge branch 'master' of https://github.com/stackware/boilerplate.git