change "extractCountryCode" exception logic