Get closer to the v4.2 errors

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>
Merge

Signed-off-by: Tom Haynes <Thomas.Haynes@primarydata.com>