diff --git a/src/analytics/backend/service/AnalyticsBackendService.py b/src/analytics/backend/service/AnalyticsBackendService.py
index 92332df6fb5a5c5d3c96d7210deaf1a98a0203b1..f676b2c5085ff3713c637efffa8d0dcfe7a37f39 100755
--- a/src/analytics/backend/service/AnalyticsBackendService.py
+++ b/src/analytics/backend/service/AnalyticsBackendService.py
@@ -151,7 +151,7 @@ class AnalyticsBackendService(GenericGrpcService):
             LOGGER.error("Failed to stop Dask Streamer. ERROR: {:}".format(e))
             return False
 
-    def close(self):        # TODO: Is this function needed?
+    def close(self):
         """
         Close the producer and cluster cleanly.
         """
@@ -159,11 +159,15 @@ class AnalyticsBackendService(GenericGrpcService):
             try:
                 self.central_producer.flush()
                 LOGGER.info("Kafka producer flushed and closed.")
-            except Exception as e:
-                LOGGER.error(f"Error closing Kafka producer: {e}")
+            except:
+                LOGGER.exception("Error closing Kafka producer")
         if self.cluster:
             try:
                 self.cluster.close()
                 LOGGER.info("Dask cluster closed.")
-            except Exception as e:
-                LOGGER.error(f"Error closing Dask cluster: {e}")
+            except:
+                LOGGER.exception("Error closing Dask cluster")
+
+    def stop(self):
+        self.close()
+        return super().stop()