diff --git a/src/NimBLEDevice.cpp b/src/NimBLEDevice.cpp
index 5dde767..ea1777d 100644
--- a/src/NimBLEDevice.cpp
+++ b/src/NimBLEDevice.cpp
@@ -783,6 +783,8 @@ NimBLEAddress NimBLEDevice::getWhiteListAddress(size_t index) {
 
         // Set the device name.
         rc = ble_svc_gap_device_name_set(deviceName.c_str());
+        if (rc != 0)
+            NIMBLE_LOGE(LOG_TAG, "ble_svc_gap_device_name_set() failed %i name_size=%zd", rc, deviceName.size());
         assert(rc == 0);
 
         ble_store_config_init();
diff --git a/src/NimBLELog.h b/src/NimBLELog.h
index e571579..ee6506b 100644
--- a/src/NimBLELog.h
+++ b/src/NimBLELog.h
@@ -10,8 +10,6 @@
 
 #include "sdkconfig.h"
 
-#if defined(CONFIG_BT_ENABLED)
-
 #if defined(ARDUINO_ARCH_ESP32) && !defined(DONT_USE_ARDUINO_BULLSHIT)
 #include "syscfg/syscfg.h"
 #include "modlog/modlog.h"
@@ -62,5 +60,4 @@
 
 #endif /*ARDUINO_ARCH_ESP32*/
 
-#endif /*CONFIG_BT_ENABLED*/
 #endif /*MAIN_NIMBLELOG_H_*/