Minor change to improve argument validations