Added validation.
More validation.