diff --git a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
index 64322e04..18f4195a 100644
--- a/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
+++ b/changelog/src/main/org/apache/maven/changelog/ChangeLog.java
@@ -568,7 +568,15 @@ public class ChangeLog
for ( Iterator i = getDevelopers().iterator(); i.hasNext(); )
{
developer = (Developer) i.next();
- userList.put( developer.getId(), developer.getName() );
+ if ( developer.getId() != null && developer.getName() != null )
+ {
+ userList.put( developer.getId(), developer.getName() );
+ }
+ else
+ {
+ LOG.warn( "WARNING: Some developer entries don't have an id or a name." );
+ LOG.warn( " Your changelog- and developer-activity reports will not be complete!" );
+ }
}
return userList;
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 4a58cd90..62358c5b 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -25,6 +25,7 @@
+ NullPointerException if developer's id is missing.
Replace netbeans's cvslib-3.6 by cvsclient-20051129.