Added Error and Validity