Throw errors instead of talking to Express
Merge branch 'master' into ejs

Conflicts:
	back/package.json