Added nice errors in production. Should fix tests.
Merge branch 'master' into Refactor

Conflicts:
	src/app.php
Resolve app conflicts