diff --git a/net/client/dap_client.c b/net/client/dap_client.c
index 0888116996f221b0e9a93983479582761e932906..ce48c0c51f2be487e8d9d06bb1ba5ffda5fa3f2c 100644
--- a/net/client/dap_client.c
+++ b/net/client/dap_client.c
@@ -194,37 +194,18 @@ void dap_client_queue_clear(dap_client_t *a_client)
  * @param a_chain_net_name
  * @param a_option
  */
-void dap_client_set_auth_cert(dap_client_t *a_client, const char *a_chain_net_name)
+void dap_client_set_auth_cert(dap_client_t *a_client, const char *a_cert_name)
 {
     static dap_cert_t *l_cert = NULL;
-    static bool l_config_read = false;
 
-    if (a_client == NULL || a_chain_net_name == NULL) {
-        log_it(L_ERROR,"Chain-net is NULL for dap_client_set_auth_cert");
+    if (a_client == NULL || a_cert_name == NULL) {
+        log_it(L_ERROR,"Client or cert-name is NULL for dap_client_set_auth_cert");
         return;
     }
-    if (!l_config_read) {
-        char *l_path = dap_strdup_printf("network/%s", a_chain_net_name);
-        if (!l_path) {
-            log_it(L_ERROR, "Can't allocate memory: file: %s line: %d", __FILE__, __LINE__);
-            return;
-        }
-        dap_config_t *l_cfg = dap_config_open(l_path);
-        l_config_read = true;
-        DAP_DEL_Z(l_path);
-        if (!l_cfg) {
-            log_it(L_ERROR, "Can't allocate memory: file: %s line: %d", __FILE__, __LINE__);
-            return;
-        }
-        const char *l_cert_name = dap_config_get_item_str(l_cfg, "general", "auth_cert");
-        dap_config_close(l_cfg);
-        if (!l_cert_name)
-            return;
-        dap_cert_find_by_name(l_cert_name);
-        if (!l_cert) {
-            log_it(L_ERROR,"l_cert is NULL by dap_cert_find_by_name");
-            return;
-        }
+    l_cert = dap_cert_find_by_name(a_cert_name);
+    if (!l_cert) {
+        log_it(L_ERROR,"l_cert is NULL by dap_cert_find_by_name");
+        return;
     }
     a_client->auth_cert = l_cert;
 }
diff --git a/net/client/include/dap_client.h b/net/client/include/dap_client.h
index 910896b85a09b53649b6ae7de74bdf6d63ec7581..62e84106391340ae3f006e7d9eaef22d99926f44 100644
--- a/net/client/include/dap_client.h
+++ b/net/client/include/dap_client.h
@@ -165,7 +165,7 @@ dap_stream_ch_t * dap_client_get_stream_ch_unsafe(dap_client_t * a_client, uint8
 uint32_t dap_client_get_stream_id(dap_client_t * a_client);
 void dap_client_set_active_channels_unsafe (dap_client_t * a_client, const char * a_active_channels);
 void dap_client_set_auth_cert_unsafe(dap_client_t * a_client, dap_cert_t *a_cert);
-void dap_client_set_auth_cert(dap_client_t *a_client, const char *a_chain_net_name);
+void dap_client_set_auth_cert(dap_client_t *a_client, const char *a_cert_name);
 
 dap_client_stage_t dap_client_get_stage(dap_client_t * a_client);
 dap_client_stage_status_t dap_client_get_stage_status(dap_client_t * a_client);
diff --git a/net/link_manager/dap_link_manager.c b/net/link_manager/dap_link_manager.c
index d9abab4b45a281c3a1327e5c124513f54200bf5b..80b5b9a59abc7348c898a96bfd2d592e629a856f 100644
--- a/net/link_manager/dap_link_manager.c
+++ b/net/link_manager/dap_link_manager.c
@@ -317,8 +317,12 @@ size_t dap_link_manager_needed_links_count(uint64_t a_net_id)
 {
 // sanity check
     dap_managed_net_t *l_net = s_find_net_by_id(a_net_id);
-    dap_return_val_if_pass(!s_link_manager || !l_net, 0);
+    dap_return_val_if_pass(!s_link_manager, 0);
 // func work
+    if (!l_net) {
+        log_it(L_ERROR, "Net ID 0x%016" DAP_UINT64_FORMAT_x " is not registered", a_net_id);
+        return 0;
+    }
     return l_net->uplinks < l_net->min_links_num ? l_net->min_links_num - l_net->uplinks : 0;
 }
 
@@ -425,10 +429,8 @@ void dap_link_manager_set_net_condition(uint64_t a_net_id, bool a_new_condition)
 
 bool dap_link_manager_get_net_condition(uint64_t a_net_id)
 {
-// sanity check
     dap_managed_net_t *l_net = s_find_net_by_id(a_net_id);
     dap_return_val_if_pass(!l_net, false);
-// func work
     return l_net->active;
 }
 
@@ -742,7 +744,6 @@ void s_update_states(void *a_arg)
     else
         s_links_request(l_link_manager);
     l_wakeup_mode = !l_wakeup_mode;
-    s_link_manager_print_links_info(s_link_manager);
 }
 
 /**
@@ -819,7 +820,7 @@ static bool s_link_update_callback(void *a_arg)
     pthread_rwlock_wrlock(&s_link_manager->links_lock);
     dap_link_t *l_link = s_link_manager_link_find(&l_args->addr);
     if (!l_link) {
-        log_it(L_ERROR, "Can't update state of non-managed link " NODE_ADDR_FP_STR, NODE_ADDR_FP_ARGS_S(l_link->addr));
+        log_it(L_ERROR, "Can't update state of non-managed link " NODE_ADDR_FP_STR, NODE_ADDR_FP_ARGS_S(l_args->addr));
         goto safe_ret;
     }
     if (!l_link->uplink.client) {