For code review - don't merge

What's the rationale of a 400 here. It means system error. If you are trying to say something is not found, 404 might be better.