diff --git a/confluent_server/confluent/plugins/hardwaremanagement/geist.py b/confluent_server/confluent/plugins/hardwaremanagement/geist.py
index 62bac271..7490965a 100644
--- a/confluent_server/confluent/plugins/hardwaremanagement/geist.py
+++ b/confluent_server/confluent/plugins/hardwaremanagement/geist.py
@@ -104,7 +104,9 @@ class GeistClient(object):
 
 def retrieve(nodes, element, configmanager, inputdata):
     if 'outlets' not in element:
-        raise exc.NotImplementedException('Not implemented')
+        for node in nodes:
+            yield  msg.ConfluentResourceUnavailable(node, 'Not implemented')
+        return
     for node in nodes:
         gc = GeistClient(node, configmanager)
         state = gc.get_outlet(element[-1])
@@ -112,7 +114,8 @@ def retrieve(nodes, element, configmanager, inputdata):
 
 def update(nodes, element, configmanager, inputdata):
     if 'outlets' not in element:
-        raise exc.NotImplementedException('Not implemented')
+        yield msg.ConfluentResourceUnavailable(node, 'Not implemented')
+        return
     for node in nodes:
         gc = GeistClient(node, configmanager)
         newstate = inputdata.powerstate(node)