diff --git a/net/client/dap_client.c b/net/client/dap_client.c
index ce48c0c51f2be487e8d9d06bb1ba5ffda5fa3f2c..92589f856dcabe402af03193d7c0e7a87a5c2596 100644
--- a/net/client/dap_client.c
+++ b/net/client/dap_client.c
@@ -196,15 +196,10 @@ void dap_client_queue_clear(dap_client_t *a_client)
  */
 void dap_client_set_auth_cert(dap_client_t *a_client, const char *a_cert_name)
 {
-    static dap_cert_t *l_cert = NULL;
-
-    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;
-    }
-    l_cert = dap_cert_find_by_name(a_cert_name);
+    dap_return_if_fail(a_client && a_cert_name);
+    dap_cert_t *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");
+        log_it(L_ERROR, "Certificate %s not found", a_cert_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 916d154620d071eebbdcf0d3b50d5b2c210ed1bf..9d7ae83f74f1da0a9cc9a0daf441715ec33f9f1b 100644
--- a/net/client/include/dap_client.h
+++ b/net/client/include/dap_client.h
@@ -164,7 +164,6 @@ dap_stream_worker_t * dap_client_get_stream_worker(dap_client_t * a_client);
 dap_stream_ch_t * dap_client_get_stream_ch_unsafe(dap_client_t * a_client, uint8_t a_ch_id);
 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_cert_name);
 
 dap_client_stage_t dap_client_get_stage(dap_client_t * a_client);
diff --git a/net/server/http_server/dap_http_simple.c b/net/server/http_server/dap_http_simple.c
index 0a14a37e60d5fac1a0965c005cbda506acef3595..6f028dc8958d1ee3614bf9b821aa0474266ee400 100644
--- a/net/server/http_server/dap_http_simple.c
+++ b/net/server/http_server/dap_http_simple.c
@@ -322,7 +322,7 @@ inline static void s_write_response_bad_request( dap_http_simple_t * a_http_simp
  */
 static bool s_proc_queue_callback(void *a_arg)
 {
-     dap_http_simple_t *l_http_simple = (dap_http_simple_t*) a_arg;
+    dap_http_simple_t *l_http_simple = (dap_http_simple_t*) a_arg;
     log_it(L_DEBUG, "dap http simple proc");
     if (!l_http_simple->http_client) {
         log_it(L_ERROR, "[!] HTTP client is already deleted!");