diff --git a/varo.py b/varo.py
index 8b8c1ad..e6c87fc 100644
--- a/varo.py
+++ b/varo.py
@@ -67,10 +67,11 @@ def get_auth_id(domain):
     }
     r = requests.post(url, headers=headers, json=data)
     r = r.json()
+    if 'data' not in r:
+        return ""
     for record in r['data']:
-        if record['name'] == domain + "." + city_domain:
-            if 'profile avatar=' not in record['content']:
-                return record['uuid']
+        if 'profile avatar=' not in record['content']:
+            return record['uuid']
     return ""
 
 def get_auth(domain):
@@ -91,10 +92,12 @@ def get_auth(domain):
     }
     r = requests.post(url, headers=headers, json=data)
     r = r.json()
+    if 'data' not in r:
+        return ""
+
     for record in r['data']:
-        if record['name'] == domain + "." + city_domain:
-            if 'profile avatar=' not in record['content']:
-                return record['content']
+        if 'profile avatar=' not in record['content']:
+            return record['content']
     return ""
 
 def get_zone():
@@ -149,13 +152,14 @@ def update_avatar(avatar,domain):
     r = requests.post(url, headers=headers, json=data)
     r = r.json()
     record_id = ""
-    for record in r['data']:
-        if record['name'] == domain + "." + city_domain:
-            if 'profile avatar=' in record['content']:
-                if record['content'].split("profile avatar=")[1] == avatar:
-                    print("Avatar already set", flush=True)
-                    return "Avatar already set"
-                record_id = record['uuid']
+    if 'data' in r:
+        for record in r['data']:
+            if record['name'] == domain + "." + city_domain:
+                if 'profile avatar=' in record['content']:
+                    if record['content'].split("profile avatar=")[1] == avatar:
+                        print("Avatar already set", flush=True)
+                        return "Avatar already set"
+                    record_id = record['uuid']
 
     if record_id == "":
         data = {