diff --git a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java
index 6e5ced826..a6584b640 100644
--- a/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java
+++ b/src/main/java/noppes/npcs/client/gui/util/script/interpreter/ScriptDocument.java
@@ -4505,6 +4505,14 @@ public class ScriptDocument {
                 return assign;
             }
         }
+
+        for (ScriptTypeInfo scriptType : scriptTypes.values()) {
+            for (FieldInfo field : scriptType.getFields().values()) {
+                AssignmentInfo assign = field.findAssignmentAtPosition(position);
+                if (assign != null)
+                    return assign;
+            }
+        }
         
         return null;
     }
@@ -4539,6 +4547,14 @@ public class ScriptDocument {
             }
         }
 
+
+        for (ScriptTypeInfo scriptType : scriptTypes.values()) {
+            for (FieldInfo field : scriptType.getFields().values()) {
+                errored.addAll(field.getErroredAssignments());
+            }
+        }
+        
+
         // Include declaration errors (duplicates, etc.)
         errored.addAll(declarationErrors);