Better checking and guarding of values.
Look in the correct places for Emails, Phones and their components