Improve error logging output
Merge branch 'master' into geezer