diff --git a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java
index 2dc7a5b8d..ac886b977 100644
--- a/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java
+++ b/jaxb-ri/external/rngom/src/main/java/com/sun/tools/rngom/digested/DSchemaBuilderImpl.java
@@ -192,7 +192,7 @@ public ElementAnnotationBuilder makeElementAnnotationBuilder(String ns, String l
     }
 
     public CommentListImpl makeCommentList() {
-        return null;
+        return new CommentListImpl();
     }
 
     public DPattern makeErrorPattern() {