diff --git a/lib/app/helper_field/settings_field.js b/lib/app/helper_field/settings_field.js
index 3a8215b..ec2f485 100644
--- a/lib/app/helper_field/settings_field.js
+++ b/lib/app/helper_field/settings_field.js
@@ -88,5 +88,5 @@ Settings.setMethod(function _toDatasource(context, value) {
 		context = context.withWorkingValue(value);
 	}
 
-	_toDatasource.super.call(this, context, value);
+	return _toDatasource.super.call(this, context, value);
 });
diff --git a/lib/core/setting.js b/lib/core/setting.js
index 6920e6e..d05c0b7 100644
--- a/lib/core/setting.js
+++ b/lib/core/setting.js
@@ -340,7 +340,7 @@ Definition.setMethod(function getEditorConfiguration(root_value, editor_context)
 
 	let result = this.toEnumEntry();
 
-	let value = root_value.getPath(this.setting_id);
+	let value = root_value ? root_value.getPath(this.setting_id) : null;
 
 	if (value) {
 		result.current_value = value.get();