Update error message and handling.
Merge branch 'master' of https://github.com/nsteijaert/HZ.git