Exceptions fixed and country code support moved to config.yml file