diff --git a/apps/location/transfer_data.py b/apps/location/transfer_data.py
index e98b537c..3198216b 100644
--- a/apps/location/transfer_data.py
+++ b/apps/location/transfer_data.py
@@ -247,19 +247,19 @@ def get_ruby_data():
 
         ruby_params = {}
 
-        if mysql_city.country_code is not None:
+        if mysql_city.country_code:
             ruby_params['country_code'] = mysql_city.country_code
 
-        if mysql_city.country_code_2 is not None:
+        if mysql_city.country_code_2:
             ruby_params['country_code_2'] = mysql_city.country_code_2
 
-        if mysql_city.region_code is not None:
+        if mysql_city.region_code:
             ruby_params['region_code'] = mysql_city.region_code
 
-        if mysql_city.subregion_code is not None:
+        if mysql_city.subregion_code:
             ruby_params['subregion_code'] = mysql_city.subregion_code
 
-        ruby_response = get_ruby_socket(ruby_params)
+        ruby_response = get_ruby_socket(ruby_params) if ruby_params else None
 
         if ruby_response is None:
             continue