diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
index a2550c79..3e593d05 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
@@ -420,8 +420,13 @@ public class ChangeLog
                     generator.cleanup();
                     parser.cleanup();
                 }
-                
-                sets.add(new ChangeLogSet(entries, logStart, logEnd));
+
+                if ( entries == null )
+                {
+                    entries = Collections.EMPTY_LIST;
+                }
+
+                    sets.add(new ChangeLogSet(entries, logStart, logEnd));
                 if (LOG.isInfoEnabled()) {
                     LOG.info("ChangeSet between " + logStart + " and " + logEnd + ": "
                             + entries.size() + " entries");