Removed duplicated code.
Raise an error when no city_code is given.