diff --git a/java/src/processing/mode/java/CompletionGenerator.java b/java/src/processing/mode/java/CompletionGenerator.java
index 41227608c..8b1c7c2df 100644
--- a/java/src/processing/mode/java/CompletionGenerator.java
+++ b/java/src/processing/mode/java/CompletionGenerator.java
@@ -1693,6 +1693,10 @@ public class CompletionGenerator {
                                                       final int lineNumber) {
     Messages.log("* preparePredictions");
 
+    if (ps.compilationUnit.types().size() == 0) {
+      return new ArrayList<>();
+    }
+
     ASTNode astRootNode = (ASTNode) ps.compilationUnit.types().get(0);
 
     // If the parsed code contains pde enhancements, take 'em out.
diff --git a/java/src/processing/mode/java/PreprocService.java b/java/src/processing/mode/java/PreprocService.java
index 846a644d0..9f67461b9 100644
--- a/java/src/processing/mode/java/PreprocService.java
+++ b/java/src/processing/mode/java/PreprocService.java
@@ -419,7 +419,6 @@ public class PreprocService {
           .forEach(result.otherProblems::add);
 
       result.hasSyntaxErrors = true;
-      return result.build();
     }
 
     // Save off the imports