Fixed the error caused by city or country being null