diff --git a/changelog/src/plugin-resources/changelog.jsl b/changelog/src/plugin-resources/changelog.jsl
index f4f8ef59..523ad3f0 100644
--- a/changelog/src/plugin-resources/changelog.jsl
+++ b/changelog/src/plugin-resources/changelog.jsl
@@ -71,7 +71,7 @@
                     <j:set var="revision"><x:expr select="$file/revision"/></j:set>
                     <j:set var="repositoryUrl" value="${pom.repository.url}"/>
                     <j:choose>
-                      <j:when test="${repositoryUrl.indexOf('?')>0}">
+                      <j:when test="${!empty(repositoryUrl)} and ${repositoryUrl.indexOf('?')>0}">
                         <j:set var="repository" value="${repositoryUrl.substring(0, repositoryUrl.indexOf('?'))}"/>
                         <j:set var="tmpMultiRepoParam" value="${repositoryUrl.substring(repository.length())}"/>
                         <j:set var="oneRepoParam" value="?${tmpMultiRepoParam.substring(1)}"/>
diff --git a/changelog/xdocs/changes.xml b/changelog/xdocs/changes.xml
index 57c47900..86a9293e 100644
--- a/changelog/xdocs/changes.xml
+++ b/changelog/xdocs/changes.xml
@@ -27,6 +27,7 @@
   <body>
     
     <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="brett" type="fix" issue="MPCHANGELOG-34" due-to="Rafael Santiago, Jr.">Prevent any NPE depending on certain repository definition conditions</action>
       <action dev="brett" type="fix">Build and run plugin against the installed version of Maven</action>
       <action dev="evenisse" type="fix" issue="MPCHANGELOG-39">Fix date format with clearcase.</action>
       <action dev="dion" type="update">Allow empty passwords in create-cvspass</action>