CFK-78: If no type is set for phone, then use NULL instead of an empty string