Added better errors
Merge branch 'master' into orders

Conflicts:
	Gemfile.lock