Move null checks back into the validate method