diff --git a/framework/unit_registry.c b/framework/unit_registry.c
index 4459a9f..84dcc89 100644
--- a/framework/unit_registry.c
+++ b/framework/unit_registry.c
@@ -43,8 +43,11 @@ static int32_t unit_count = -1;
 void ureg_add_type(const UnitDriver *driver)
 {
     assert_param(driver != NULL);
-    assert_param(driver->description != NULL);
     assert_param(driver->name != NULL);
+
+    dbg("Loading driver %s", driver->name);
+
+    assert_param(driver->description != NULL);
     assert_param(driver->preInit != NULL);
     assert_param(driver->cfgLoadBinary != NULL);
     assert_param(driver->cfgLoadIni != NULL);
diff --git a/platform/plat_init.c b/platform/plat_init.c
index 1b356b1..18fbbda 100644
--- a/platform/plat_init.c
+++ b/platform/plat_init.c
@@ -27,7 +27,7 @@ void plat_init(void)
 
     dbg("Loading settings ...");
     // Load settings from Flash and apply (includes System settings and all Unit settings)
-    settings_load();
+    settings_load(); // XXX maybe this should be moved to the main task
 
     comm_init();
 }