Fixes #75

Throws 400 instead of 500
Closes #75