Fixing D-10927: Should be Bad Request not 500