I admit, this was outside the scope of this change but I couldn't help myself. Also, admittedly, I was desperate for 400 error from the middleware and at this was the first place I could find one happening.