spacing, err messages
Merge branch 'master' into production

* master:
  spacing, err messages