Added extra validation.