Fix issue with null saved city