Fix: undefined method `country_code' for nil:NilClass