diff --git a/_modules/reclass.py b/_modules/reclass.py
index 305ac2c..227faf0 100644
--- a/_modules/reclass.py
+++ b/_modules/reclass.py
@@ -260,8 +260,12 @@
                                    expr_form='grain',
                                    fun='grains.item',
                                    arg=('id',))
+    if res.values():
+        ret = res.values()[0].get('ret', {}).get('id', '')
+    else:
+        ret = host
 
-    return res.values()[0].get('ret', {}).get('id', '')
+    return ret
 
 
 def _interpolate_graph_data(graph_data, **kwargs):
@@ -270,6 +274,8 @@
         if not node.get('relations', []):
             node['relations'] = []
         for relation in node.get('relations', []):
+            if not relation.get('status', None):
+                relation['status'] = 'unknown'
             if relation.get('host_from_target', None):
                 host = _guess_host_from_target(relation.pop('host_from_target'))
                 relation['host'] = host
@@ -356,7 +362,8 @@
         for service, service_data in services.items():
             additional_data = {
                 'host': host,
-                'service': service
+                'service': service,
+                'status': 'unknown'
             }
             service_data.update(additional_data)
             graph.append(service_data)
@@ -365,7 +372,8 @@
         for service, service_data in services.items():
             additional_data = {
                 'host': host,
-                'service': service
+                'service': service,
+                'status': 'success'
             }
             service_data.update(additional_data)
             host_list = [g.get('host', '') for g in graph]