v0.20.4 Check additional opportunities to send 400 Bad Request.
Merge.