diff --git a/homeassistant/components/homematic.py b/homeassistant/components/homematic.py
index fb31408bd8260d8c0de53c36515a50e8ebaaac26..f2d71bb409a8cd36be8a2fa9b7a2b4588bad5f61 100644
--- a/homeassistant/components/homematic.py
+++ b/homeassistant/components/homematic.py
@@ -92,7 +92,6 @@ def setup(hass, config):
 
     # Create server thread
     bound_system_callback = partial(system_callback_handler, hass, config)
-    # pylint: disable=unexpected-keyword-arg
     HOMEMATIC = HMConnection(local=local_ip,
                              localport=local_port,
                              remote=remote_ip,
@@ -288,15 +287,19 @@ def setup_hmdevice_discovery_helper(hmdevicetype, discovery_info,
 
 def _hm_event_handler(hass, device, caller, attribute, value):
     """Handle all pyhomematic device events."""
-    channel = device.split(":")[1]
-    address = device.split(":")[0]
-    hmdevice = HOMEMATIC.devices.get(address)
+    try:
+        channel = int(device.split(":")[1])
+        address = device.split(":")[0]
+        hmdevice = HOMEMATIC.devices.get(address)
+    except (TypeError, ValueError):
+        _LOGGER.error("Event handling channel convert error!")
+        return
 
     # is not a event?
     if attribute not in hmdevice.EVENTNODE:
         return
 
-    _LOGGER.debug("Event %s for %s channel %s", attribute,
+    _LOGGER.debug("Event %s for %s channel %i", attribute,
                   hmdevice.NAME, channel)
 
     # a keypress event
diff --git a/homeassistant/components/sensor/homematic.py b/homeassistant/components/sensor/homematic.py
index 2efa4fdef38c1d85a95262fc8b2fb657a532c65e..efd22b6cd6902a7696e6e64ca779f1e335cbb63a 100644
--- a/homeassistant/components/sensor/homematic.py
+++ b/homeassistant/components/sensor/homematic.py
@@ -17,7 +17,8 @@ _LOGGER = logging.getLogger(__name__)
 DEPENDENCIES = ['homematic']
 
 HM_STATE_HA_CAST = {
-    "RotaryHandleSensor": {0: "closed", 1: "tilted", 2: "open"}
+    "RotaryHandleSensor": {0: "closed", 1: "tilted", 2: "open"},
+    "WaterSensor": {0: "dry", 1: "wet", 2: "water"}
 }
 
 HM_UNIT_HA_CAST = {