Refactored UnsupportedCountryException triggering