Merge "Fix NPE when phone number or email is null" into klp-dev