diff --git a/src/renderer/config-blocks/Lookup.svelte b/src/renderer/config-blocks/Lookup.svelte
index e38ac0321..62a2a0fdc 100644
--- a/src/renderer/config-blocks/Lookup.svelte
+++ b/src/renderer/config-blocks/Lookup.svelte
@@ -255,7 +255,7 @@
         />
 
         <button
-          class:invisible={i === 0}
+          class:invisible={i === 0 && lookupTable.pairs.length === 1}
           on:click={() => {
             removeLine(i);
           }}
diff --git a/src/renderer/config-blocks/components/VariableManager.svelte b/src/renderer/config-blocks/components/VariableManager.svelte
index f31b310d4..404cbf39f 100644
--- a/src/renderer/config-blocks/components/VariableManager.svelte
+++ b/src/renderer/config-blocks/components/VariableManager.svelte
@@ -98,8 +98,12 @@
   ): ScriptSegment[] | undefined {
     const processed = preProcessor(statement);
     const assignments: ScriptSegment[] = [];
-    const variableNames = splitParts(processed.split("=")[0]);
-    const variableValues = splitParts(processed.split("=")[1]);
+    const variableNames = splitParts(processed.split("=")[0]).map((s) =>
+      s.trim(),
+    );
+    const variableValues = splitParts(processed.split("=")[1]).map((s) =>
+      s.trim(),
+    );
 
     if (variableNames.length !== variableValues.length) {
       throw new Error("Error parsing variables: mismatched names and values!");
@@ -148,14 +152,14 @@
   }
 
   function addVariable() {
-    const obj = { name: "", value: "" };
-    segments.push(obj);
-    validators.push({
-      value: false,
-      func: (e) => new Validator(e).isLuaVariable().Result(),
-    });
-    handleInput();
-    handleChange();
+    segments = [...segments, { name: "", value: "" }];
+    validators = [
+      ...validators,
+      {
+        value: false,
+        func: (e) => new Validator(e).isLuaVariable().Result(),
+      },
+    ];
   }
 
   function removeVariable(index: number) {
@@ -202,7 +206,7 @@
         </div>
 
         <button
-          class:invisible={i === 0}
+          class:invisible={segments.length === 1}
           on:click={() => {
             removeVariable(i);
           }}
diff --git a/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte b/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte
index 75e9a80e0..70ae1af3e 100644
--- a/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte
+++ b/src/renderer/main/panels/configuration/components/DynamicWrapper.svelte
@@ -24,6 +24,7 @@
   import Indentation from "./Indentation.svelte";
   import EditableName from "../../../../config-blocks/components/EditableName.svelte";
   import { selected_actions } from "../../../../runtime/selected-actions.store";
+  import { logger } from "../../../../runtime/runtime.store";
   import { get } from "svelte/store";
   import { information } from "../../../../config-blocks/CodeBlock.svelte";
   import { Modal } from "../../../modals/modal.store";
@@ -99,10 +100,17 @@
       return;
     }
 
+    logger.set({
+      type: "alert",
+      mode: 0,
+      classname: "luanotok",
+      message: `Invalid edit discarded. Action block reverted to last valid state.`,
+    });
+
     updateAction(
       action,
       new ActionData(action.short, action.synced, action.name),
-      action.isValid(),
+      true,
     );
   }
 
diff --git a/src/renderer/runtime/runtime.ts b/src/renderer/runtime/runtime.ts
index e0b364b13..1d19b9625 100644
--- a/src/renderer/runtime/runtime.ts
+++ b/src/renderer/runtime/runtime.ts
@@ -854,6 +854,14 @@ export class GridEvent extends RuntimeNode<EventData> {
       });
     }
 
+    if (!this.isValid()) {
+      return Promise.resolve({
+        value: true,
+        text: "Nothing to sync, event has invalid actions.",
+        type: GridOperationType.SEND_EVENT_TO_GRID,
+      });
+    }
+
     const element = this.parent as GridElement;
     const page = element.parent as GridPage;
     const module = page.parent as GridModule;