diff --git a/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py b/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py
index 8d64e78b..933a852b 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/enclosure.py
@@ -26,6 +26,10 @@ def update(nodes, element, configmanager, inputdata):
         except KeyError:
             em = node
             eb = -1
+        if not em:
+            em = node
+        if not eb:
+            eb = -1
         try:
             for rsp in core.handle_path(
                     '/nodes/{0}/_enclosure/reseat_bay'.format(em),