diff --git a/erpnext/setup/setup_wizard/data/country_wise_tax.json b/erpnext/setup/setup_wizard/data/country_wise_tax.json
index 06f7f09..780b88f 100644
--- a/erpnext/setup/setup_wizard/data/country_wise_tax.json
+++ b/erpnext/setup/setup_wizard/data/country_wise_tax.json
@@ -1039,7 +1039,7 @@
 		}
 	},
 
-	"Russia": {
+	"Russian Federation": {
 		"Russia VAT 18%": {
 			"account_name": "VAT 18%",
 			"tax_rate": 18.00,
diff --git a/erpnext/setup/setup_wizard/setup_wizard.py b/erpnext/setup/setup_wizard/setup_wizard.py
index 7c65f88..66000cd 100644
--- a/erpnext/setup/setup_wizard/setup_wizard.py
+++ b/erpnext/setup/setup_wizard/setup_wizard.py
@@ -247,7 +247,7 @@
 	
 def create_sales_tax(args):
 	country_wise_tax = get_country_wise_tax(args.get("country"))
-	if len(country_wise_tax)>0:
+	if country_wise_tax and len(country_wise_tax) > 0:
 		for sales_tax, tax_data in country_wise_tax.items():
 			make_tax_account_and_template(args.get("company_name").strip(), 
 				tax_data.get('account_name'), tax_data.get('tax_rate'), sales_tax)