modify request_cityid to raise ArgumentError with invalid argument.
Merge branch 'work'