diff --git a/homeassistant/components/zwave/__init__.py b/homeassistant/components/zwave/__init__.py
index 867a0f96062..69168b23465 100755
--- a/homeassistant/components/zwave/__init__.py
+++ b/homeassistant/components/zwave/__init__.py
@@ -638,7 +638,6 @@ class ZWaveDeviceEntity(Entity):
     def _value_handler(self, method=None, class_id=None, index=None,
                        label=None, data=None, member=None, **kwargs):
         """Get the values for a given command_class with arguments."""
-        varname = member
         if class_id is not None:
             kwargs[CLASS_ID] = class_id
         _LOGGER.debug('method=%s, class_id=%s, index=%s, label=%s, data=%s,'
@@ -653,16 +652,20 @@ class ZWaveDeviceEntity(Entity):
             if index is not None and value.index != index:
                 continue
             if label is not None:
+                label_found = False
                 for entry in label:
-                    if entry is not None and value.label != entry:
-                        continue
+                    if value.label == entry:
+                        label_found = True
+                        break
+                if not label_found:
+                    continue
             if method == 'set':
                 value.data = data
                 return
             if data is not None and value.data != data:
                 continue
             if member is not None:
-                results = getattr(value, varname)
+                results = getattr(value, member)
             else:
                 results = value
             break