diff --git a/server/engine/src/main/java/org/eclipse/lsp/cobol/core/engine/analysis/AnalysisContext.java b/server/engine/src/main/java/org/eclipse/lsp/cobol/core/engine/analysis/AnalysisContext.java
index 9358a39f35..22537deceb 100644
--- a/server/engine/src/main/java/org/eclipse/lsp/cobol/core/engine/analysis/AnalysisContext.java
+++ b/server/engine/src/main/java/org/eclipse/lsp/cobol/core/engine/analysis/AnalysisContext.java
@@ -22,11 +22,11 @@
 import org.eclipse.lsp.cobol.common.AnalysisConfig;
 import org.eclipse.lsp.cobol.common.benchmark.BenchmarkSession;
 import org.eclipse.lsp.cobol.common.benchmark.BenchmarkSessionProvider;
+import org.eclipse.lsp.cobol.common.dialects.CobolLanguageId;
 import org.eclipse.lsp.cobol.common.error.SyntaxError;
 import org.eclipse.lsp.cobol.common.mapping.ExtendedDocument;
 import org.eclipse.lsp.cobol.common.model.tree.Node;
 import org.eclipse.lsp.cobol.core.semantics.CopybooksRepository;
-import org.eclipse.lsp.cobol.common.dialects.CobolLanguageId;
 
 /**
  * Contains related to analysis state
@@ -43,7 +43,7 @@ public class AnalysisContext implements BenchmarkSessionProvider {
   private final String text;
   private final CobolLanguageId languageId;
 
-  private @Setter List<Node> dialectNodes;
+  private @Setter List<Node> dialectNodes = new ArrayList<>();
   private @Setter CopybooksRepository copybooksRepository;
 
   public AnalysisContext(ExtendedDocument extendedDocument,
diff --git a/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/hp/HpCopybookProcessingStage.java b/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/hp/HpCopybookProcessingStage.java
index f4bbd9c1ad..396b879850 100644
--- a/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/hp/HpCopybookProcessingStage.java
+++ b/server/engine/src/main/java/org/eclipse/lsp/cobol/dialects/hp/HpCopybookProcessingStage.java
@@ -57,7 +57,6 @@ class HpCopybookProcessingStage implements Stage<AnalysisContext, DialectOutcome
   @Override
   public StageResult<DialectOutcome> run(AnalysisContext context, StageResult<Void> prevStageResult) {
     List<SyntaxError> errors = new LinkedList<>();
-
     List<CopybookDescriptor> cbs = CopybookParser.parseAndCleanup(context.getExtendedDocument());
     cbs.forEach(
         cb -> {