fix nitpicks from Hound
Merge branch 'bugs/gracefully-fail-on-bad-formats'
more nits from Hound fixed