Merge branch 'better-errors' into local-develop