[#1938] Return 400 on bad URI
Merge pull request #1950 from baloo/improvements/1938-Invalid-URI-return-400

[#1938] Return 400 on bad URI