Error messages now appear only once with cleaner wording