Invalid error should return with 400
Merge pull request #184 from nevill/develop

Invalid error should return with 400