Added validation checks for quotes