diff --git a/raincloudy/faucet.py b/raincloudy/faucet.py
index cf52a42..fe60a86 100644
--- a/raincloudy/faucet.py
+++ b/raincloudy/faucet.py
@@ -118,7 +118,7 @@ def update(self):
     def _find_zone_by_id(self, zone_id):
         """Return zone by id."""
         if not self.zones:
-            return
+            return None
 
         zone = list(filter(
             lambda zone: zone.id == zone_id, self.zones))
@@ -263,6 +263,7 @@ def _set_rain_delay(self, zoneid, value):
         attr = 'zone{}_rain_delay_select'.format(zoneid)
         ddata[attr] = value
         self.submit_action(ddata)
+        return True
 
     @property
     def rain_delay(self):
@@ -296,6 +297,7 @@ def _set_auto_watering(self, zoneid, value):
         except KeyError:
             pass
         self.submit_action(ddata)
+        return True
 
     @property
     def auto_watering(self):
diff --git a/raincloudy/helpers.py b/raincloudy/helpers.py
index 9f8406d..75b3f50 100644
--- a/raincloudy/helpers.py
+++ b/raincloudy/helpers.py
@@ -69,6 +69,7 @@ def find_attr(data, key):
     for member in data:
         if member.get('cmd') == 'as' and member.get('id') == key:
             return member.get('val')
+    return None
 
 
 def find_program_status(data, zone):