diff --git a/tendrl/node_agent/manager/__init__.py b/tendrl/node_agent/manager/__init__.py
index 9bb449f2..dc5d70eb 100644
--- a/tendrl/node_agent/manager/__init__.py
+++ b/tendrl/node_agent/manager/__init__.py
@@ -68,12 +68,12 @@ def load_and_execute_sds_discovery_plugins(self):
             if sds_details:
                 try:
                     tendrl_ns.node_agent.objects.DetectedCluster(
-                        detected_cluster_id=sds_details['detected_cluster_id'],
-                        sds_pkg_name=sds_details['pkg_name'],
-                        sds_pkg_version=sds_details['pkg_version'],
+                        detected_cluster_id=sds_details.get('detected_cluster_id'),
+                        sds_pkg_name=sds_details.get('pkg_name'),
+                        sds_pkg_version=sds_details.get('pkg_version'),
                     ).save()
                 except etcd.EtcdException as ex:
-                    LOG.error('Failed to update etcd . \Error %s' % str(ex))
+                    LOG.error('Failed to update etcd . Error %s' % str(ex))
                 break