diff --git a/trustgraph/clients/graph_embeddings_client.py b/trustgraph/clients/graph_embeddings_client.py
index 02c2112b..3f361ecd 100644
--- a/trustgraph/clients/graph_embeddings_client.py
+++ b/trustgraph/clients/graph_embeddings_client.py
@@ -33,7 +33,7 @@ class GraphEmbeddingsClient(BaseClient):
         if output_queue == None:
             output_queue = graph_embeddings_response_queue
             
-        super(EmbeddingsClient, self).__init__(
+        super(GraphEmbeddingsClient, self).__init__(
             log_level=log_level,
             subscriber=subscriber,
             input_queue=input_queue,
diff --git a/trustgraph/clients/graph_rag_client.py b/trustgraph/clients/graph_rag_client.py
index 281d3547..60f8d47c 100644
--- a/trustgraph/clients/graph_rag_client.py
+++ b/trustgraph/clients/graph_rag_client.py
@@ -16,7 +16,7 @@ WARN=_pulsar.LoggerLevel.Warn
 INFO=_pulsar.LoggerLevel.Info
 DEBUG=_pulsar.LoggerLevel.Debug
 
-class GraphRagClient:
+class GraphRagClient(BaseClient):
 
     def __init__(
             self,
@@ -31,9 +31,9 @@ class GraphRagClient:
             input_queue = graph_rag_request_queue
 
         if output_queue == None:
-            output_queue = graph_rag_request_queue
+            output_queue = graph_rag_response_queue
   
-        super(EmbeddingsClient, self).__init__(
+        super(GraphRagClient, self).__init__(
             log_level=log_level,
             subscriber=subscriber,
             input_queue=input_queue,
@@ -47,5 +47,5 @@ class GraphRagClient:
 
         return self.call(
             query=query, timeout=timeout
-        ).entities
+        ).response
 
diff --git a/trustgraph/clients/triples_query_client.py b/trustgraph/clients/triples_query_client.py
index e0703423..a3246189 100644
--- a/trustgraph/clients/triples_query_client.py
+++ b/trustgraph/clients/triples_query_client.py
@@ -34,7 +34,7 @@ class TriplesQueryClient(BaseClient):
         if output_queue == None:
             output_queue = triples_response_queue
 
-        super(EmbeddingsClient, self).__init__(
+        super(TriplesQueryClient, self).__init__(
             log_level=log_level,
             subscriber=subscriber,
             input_queue=input_queue,
diff --git a/trustgraph/query/graph_embeddings/milvus/service.py b/trustgraph/query/graph_embeddings/milvus/service.py
index 8078b17a..bb2eaa0d 100755
--- a/trustgraph/query/graph_embeddings/milvus/service.py
+++ b/trustgraph/query/graph_embeddings/milvus/service.py
@@ -78,7 +78,7 @@ class Processor(ConsumerProducer):
             entities = ents2
 
             print("Send response...", flush=True)
-            r = GraphEmbeddingsResponse(entities=entities)
+            r = GraphEmbeddingsResponse(entities=entities, error=None)
             self.producer.send(r, properties={"id": id})
 
             print("Done.", flush=True)
diff --git a/trustgraph/query/triples/cassandra/service.py b/trustgraph/query/triples/cassandra/service.py
index 8d015d95..5e1e0e3e 100755
--- a/trustgraph/query/triples/cassandra/service.py
+++ b/trustgraph/query/triples/cassandra/service.py
@@ -130,7 +130,7 @@ class Processor(ConsumerProducer):
             ]
 
             print("Send response...", flush=True)
-            r = TriplesQueryResponse(triples=triples)
+            r = TriplesQueryResponse(triples=triples, error=None)
             self.producer.send(r, properties={"id": id})
 
             print("Done.", flush=True)
diff --git a/trustgraph/retrieval/graph_rag/rag.py b/trustgraph/retrieval/graph_rag/rag.py
index 47708283..98697d4f 100755
--- a/trustgraph/retrieval/graph_rag/rag.py
+++ b/trustgraph/retrieval/graph_rag/rag.py
@@ -111,7 +111,7 @@ class Processor(ConsumerProducer):
             response = self.rag.query(v.query)
 
             print("Send response...", flush=True)
-            r = GraphRagResponse(response = response)
+            r = GraphRagResponse(response = response, error=None)
             self.producer.send(r, properties={"id": id})
 
             print("Done.", flush=True)