Dealt with possibility of null city and/or country