diff --git a/java/src/processing/mode/java/pdex/ASTGenerator.java b/java/src/processing/mode/java/pdex/ASTGenerator.java
index f36c737d2..ec0b50976 100644
--- a/java/src/processing/mode/java/pdex/ASTGenerator.java
+++ b/java/src/processing/mode/java/pdex/ASTGenerator.java
@@ -115,8 +115,6 @@ public class ASTGenerator {
   protected final JavaEditor editor;
   public DefaultMutableTreeNode codeTree = new DefaultMutableTreeNode();
 
-  protected CompilationUnit compilationUnit;
-
   protected final GUI gui;
 
 
@@ -1049,6 +1047,8 @@ public class ASTGenerator {
 
     // Find closest ASTNode to the linenumber
 //    log("getASTNodeAt: Node line number " + pdeLineNumber);
+    CompilationUnit compilationUnit =
+        errorCheckerService.latestResult.compilationUnit;
     ASTNode lineNode = findLineOfNode(compilationUnit, pdeLineNumber, offset,
                                       name);
 
@@ -2882,8 +2882,7 @@ public class ASTGenerator {
   }
 
 
-  protected void updateAST(CompilationUnit cu, DefaultMutableTreeNode tree) {
-    compilationUnit = cu;
+  protected void updateAST(DefaultMutableTreeNode tree) {
     codeTree = tree;
 
     if (SHOW_DEBUG_TREE) {
diff --git a/java/src/processing/mode/java/pdex/ErrorCheckerService.java b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
index c8068587d..787afa444 100644
--- a/java/src/processing/mode/java/pdex/ErrorCheckerService.java
+++ b/java/src/processing/mode/java/pdex/ErrorCheckerService.java
@@ -174,7 +174,7 @@ public class ErrorCheckerService {
         EventQueue.invokeLater(new Runnable() {
           @Override
           public void run() {
-            astGenerator.updateAST(latestResult.compilationUnit, tree);
+            astGenerator.updateAST(tree);
           }
         });
       }
@@ -219,7 +219,7 @@ public class ErrorCheckerService {
                     @Override
                     public void run() {
                       synchronized (astGenerator) {
-                        astGenerator.updateAST(latestResult.compilationUnit, tree);
+                        astGenerator.updateAST(tree);
                       }
                       updateErrorTable(result.problems);
                       editor.updateErrorBar(result.problems);