diff --git a/homeassistant/components/homematic/__init__.py b/homeassistant/components/homematic/__init__.py
index 80345866b1ff77..f0fc2a40278519 100644
--- a/homeassistant/components/homematic/__init__.py
+++ b/homeassistant/components/homematic/__init__.py
@@ -573,6 +573,8 @@ def _create_ha_id(name, channel, param, count):
     if count > 1 and param is not None:
         return f"{name} {channel} {param}"
 
+    raise ValueError(f"Unable to create unique id for count:{count} and param:{param}")
+
 
 def _hm_event_handler(hass, interface, device, caller, attribute, value):
     """Handle all pyhomematic device events."""
@@ -621,3 +623,4 @@ def _device_from_servicecall(hass, service):
     for devices in hass.data[DATA_HOMEMATIC].devices.values():
         if address in devices:
             return devices[address]
+    return None
diff --git a/homeassistant/components/homematic/climate.py b/homeassistant/components/homematic/climate.py
index bf1295df6be7b8..2be28487cbb9e0 100644
--- a/homeassistant/components/homematic/climate.py
+++ b/homeassistant/components/homematic/climate.py
@@ -125,6 +125,7 @@ def current_humidity(self):
         for node in HM_HUMI_MAP:
             if node in self._data:
                 return self._data[node]
+        return None
 
     @property
     def current_temperature(self):
@@ -132,6 +133,7 @@ def current_temperature(self):
         for node in HM_TEMP_MAP:
             if node in self._data:
                 return self._data[node]
+        return None
 
     @property
     def target_temperature(self):