diff --git a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
index 569f022716..e7465fa003 100644
--- a/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
+++ b/src/Models/ThemeConfig/Conversion/PrepareLayer.ts
@@ -596,7 +596,12 @@ class DetectInline extends DesugaringStep<QuestionableTagRenderingConfigJson> {
             return json
         }
 
-        if(!Object.values(json.render).some(render => render !== "{"+json.freeform.key+"}")){
+        if(json.render === undefined){
+            context.err("No 'render' defined")
+            return json
+        }
+
+        if(!Object.values(json?.render)?.some(render => render !== "{"+json.freeform.key+"}")){
             // We only render the current value, without anything more. Not worth inlining
             return json
         }
diff --git a/src/UI/Studio/SchemaBasedArray.svelte b/src/UI/Studio/SchemaBasedArray.svelte
index f61b15495e..9767baea00 100644
--- a/src/UI/Studio/SchemaBasedArray.svelte
+++ b/src/UI/Studio/SchemaBasedArray.svelte
@@ -56,7 +56,7 @@
     currentValue.ping()
 
     if (isTagRenderingBlock) {
-      state.highlightedItem.setData({ path: [...path, currentValue.data.length - 1], schema })
+      state.highlightedItem?.setData({ path: [...path, currentValue.data.length - 1], schema })
     }
   }