Some fixes for new user views breaking on bad data or certain configurations.
Merge branch 'master' into production