Improving validation when adding.