diff --git a/src/core/settings.c b/src/core/settings.c
index b793ae68..e7001d68 100644
--- a/src/core/settings.c
+++ b/src/core/settings.c
@@ -233,6 +233,10 @@ struct settings * find_child_settings ( struct settings *parent,
 	struct settings *settings;
 	size_t len;
 
+	/* NULL parent => add to settings root */
+	if ( parent == NULL )
+		parent = &settings_root;
+
 	/* Look for a child whose name matches the initial component */
 	list_for_each_entry ( settings, &parent->children, siblings ) {
 		len = strlen ( settings->name );