diff --git a/crypto/src/dap_sign.c b/crypto/src/dap_sign.c
index 11501a8b9649b4da2a2a72c1fa886a82b492b781..e4599c19e7f9b934dbd40fc37f2d98e430e195db 100755
--- a/crypto/src/dap_sign.c
+++ b/crypto/src/dap_sign.c
@@ -213,7 +213,7 @@ int dap_sign_create_output(dap_enc_key_t *a_key, const void * a_data, const size
 dap_sign_t * dap_sign_create(dap_enc_key_t *a_key, const void * a_data,
         const size_t a_data_size, size_t a_output_wish_size)
 {
-    dap_return_val_if_pass(!a_key, NULL);
+    dap_return_val_if_fail(a_key && a_key->priv_key_data && a_key->priv_key_data_size, NULL);
     const void * l_sign_data;
     size_t l_sign_data_size;
 
diff --git a/global-db/dap_global_db_driver.c b/global-db/dap_global_db_driver.c
index f62e29f69dac65672c890a6d4013dd34796161b3..e949afc335ac2e83257b7d0868df72004731076f 100644
--- a/global-db/dap_global_db_driver.c
+++ b/global-db/dap_global_db_driver.c
@@ -82,7 +82,7 @@ static dap_global_db_driver_callbacks_t s_drv_callback;
  */
 int dap_global_db_driver_init(const char *a_driver_name, const char *a_filename_db)
 {
-int l_ret = -1;
+    int l_ret = -1;
 
     if (s_used_driver[0] )
         dap_global_db_driver_deinit();
@@ -101,7 +101,7 @@ int l_ret = -1;
 
    // Check for engine
     if(!dap_strcmp(s_used_driver, "ldb"))
-        l_ret = -1;
+        log_it(L_ERROR, "Unsupported global_db driver \"%s\"", a_driver_name);
 #ifdef DAP_CHAIN_GDB_ENGINE_SQLITE
     else if(!dap_strcmp(s_used_driver, "sqlite") || !dap_strcmp(s_used_driver, "sqlite3") )
         l_ret = dap_global_db_driver_sqlite_init(l_db_path_ext, &s_drv_callback);