Fixing D-10927
Merge remote-tracking branch 'upstream/master'
Merge pull request #230 from mattkovacs/master

Fixing D-10927: Should be Bad Request not 500