More validation for #645