Safeguard for missing sensors or name

helium_commander/element.py

@@ -1,14 +1,17 @@
 from __future__ import unicode_literals
 from helium import Element
-from operator import attrgetter
 
 
 def display_map(cls, client):
     def _mac(self):
         return self.meta.mac
 
     def _count_sensor(self):
-        return len(self.sensors(use_included=True))
+        try:
+            return len(self.sensors(use_included=True))
+        except AttributeError:
+            pass
+        return None
 
     def _seen(self):
         try:
@@ -17,12 +20,15 @@ def _seen(self):
             pass
         return None
 
+    def _name(self):
+        return getattr(self, 'name', None)
+
     dict = super(Element, cls).display_map(client)
     dict.update([
         ('mac', _mac),
         ('sensors', _count_sensor),
         ('seen', _seen),
-        ('name', attrgetter('name')),
+        ('name', _name)
     ])
     return dict