Pre-validation checks

Follow