diff --git a/src/panels/config/automation/ha-automation-editor.ts b/src/panels/config/automation/ha-automation-editor.ts index b5af99cfa6..9349c17610 100644 --- a/src/panels/config/automation/ha-automation-editor.ts +++ b/src/panels/config/automation/ha-automation-editor.ts @@ -503,9 +503,9 @@ export class HaAutomationEditor extends KeyboardShortcutMixin(LitElement) { } }, (errors) => { - this._errors = errors.body.message; + this._errors = errors.body.message || errors.error || errors.body; showToast(this, { - message: errors.body.message, + message: errors.body.message || errors.error || errors.body, }); throw errors; } diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts index 808b4e4fae..d658ea7fe4 100644 --- a/src/panels/config/script/ha-script-editor.ts +++ b/src/panels/config/script/ha-script-editor.ts @@ -660,9 +660,9 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) { } }, (errors) => { - this._errors = errors.body.message; + this._errors = errors.body.message || errors.error || errors.body; showToast(this, { - message: errors.body.message, + message: errors.body.message || errors.error || errors.body, }); throw errors; }