diff --git a/tuskar_ui/api.py b/tuskar_ui/api.py
index 77c3f2a38..b8eb12ca8 100644
--- a/tuskar_ui/api.py
+++ b/tuskar_ui/api.py
@@ -293,9 +293,9 @@ class Node(StringIdAPIResourceWrapper):
 
     @property
     def rack_id(self):
-        if self._apiresource.rack:
+        try:
             return unicode(self._apiresource.rack['id'])
-        else:
+        except AttributeError:
             return None
 
     @property
@@ -454,9 +454,10 @@ class Rack(StringIdAPIResourceWrapper):
 
     @property
     def resource_class_id(self):
-        rclass = self._apiresource.resource_class
-        resource_class_id = rclass['id'] if rclass else None
-        return resource_class_id
+        try:
+            return self._apiresource.resource_class['id']
+        except AttributeError:
+            return None
 
     @property
     def resource_class(self):
diff --git a/tuskar_ui/test/test_data/tuskar_data.py b/tuskar_ui/test/test_data/tuskar_data.py
index c7b8a623c..b5e121262 100644
--- a/tuskar_ui/test/test_data/tuskar_data.py
+++ b/tuskar_ui/test/test_data/tuskar_data.py
@@ -123,7 +123,7 @@ def data(TEST):
                               {"name": "total_memory",
                                "value": "2",
                                "unit": "MB"}],
-                         'resource_class': None})
+                         })
     TEST.tuskarclient_racks.add(rack_1, rack_2, rack_3)
     TEST.tuskar_racks.add(api.Rack(rack_1), api.Rack(rack_2), api.Rack(rack_3))