diff --git a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java
index 4a820e9c5075..1a8685b0d1b3 100644
--- a/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java
+++ b/java/java.source.base/src/org/netbeans/modules/java/source/indexing/VanillaCompileWorker.java
@@ -907,7 +907,7 @@ private SortedMap<Long, List<Diagnostic<? extends JavaFileObject>>> treeDiags(Tr
             public Void visitNewClass(NewClassTree node, Void p) {
                 //TODO: fix constructors:
                 JCNewClass nc = (JCNewClass) node;
-                if (node.getClassBody() != null && !nc.clazz.type.hasTag(TypeTag.ERROR)) {
+                if (node.getClassBody() != null && nc.clazz.type != null && !nc.clazz.type.hasTag(TypeTag.ERROR)) {
                     if (nc.constructor.kind == Kind.MTH) {
                         //make sure this class is generated even if the code is erroneous:
                         anonymousClasses.add(nc);