Add null verification in getCountryISO
New service jar