Docs/err msg tidy up from @jpountz review