Avoid broken email entries on yahoo API. Closes #125