fixes #185 display error conditionally and some standards fixes
Merge pull request #211 from bigspring/feature/builder-tidy

fixes #185 display error conditionally and some standards fixes