Added in some validations.