diff --git a/jira/plugin.jelly b/jira/plugin.jelly
index 79189aaa..ba2667fa 100644
--- a/jira/plugin.jelly
+++ b/jira/plugin.jelly
@@ -97,9 +97,6 @@
         />
     </j:catch>
 
-    <!-- FIXME: Hack, taken from announcement/plugin.jelly -->
-    <ant:replace file="${maven.gen.docs}/jira.xml" token="&amp;amp;" value="&amp;"/>
-
     <j:choose>
       <j:when test="${!empty(parseresult)}">
         <ant:echo>Error: unable to parse jira results due to an error: ${parseresult.message}. Jira report will not be generated</ant:echo>
@@ -111,6 +108,8 @@
             <include name="**/*.gif"/>
           </fileset>
         </copy>
+        <!-- FIXME: Hack, taken from announcement/plugin.jelly -->
+        <ant:replace file="${maven.gen.docs}/jira.xml" token="&amp;amp;" value="&amp;"/>
       </j:otherwise>
     </j:choose>
 
@@ -132,9 +131,6 @@
         <j:remove var="jiraUrl"/>
       </j:catch>
 
-      <!-- FIXME: Hack, taken from announcement/plugin.jelly -->
-      <ant:replace file="${maven.gen.docs}/jira-roadmap.xml" token="&amp;amp;" value="&amp;"/>
-
       <j:choose>
         <j:when test="${!empty(parseresult)}">
           <ant:echo>Error: unable to parse jira results due to an error: ${parseresult.message}. Jira roadmap report will not be generated</ant:echo>
@@ -146,6 +142,8 @@
               <include name="**/*.gif"/>
             </fileset>
           </copy>
+          <!-- FIXME: Hack, taken from announcement/plugin.jelly -->
+          <ant:replace file="${maven.gen.docs}/jira-roadmap.xml" token="&amp;amp;" value="&amp;"/>
         </j:otherwise>
       </j:choose>
 
diff --git a/jira/project.xml b/jira/project.xml
index 35f43dbd..1a9a316a 100644
--- a/jira/project.xml
+++ b/jira/project.xml
@@ -22,7 +22,7 @@
   <pomVersion>3</pomVersion>
   <id>maven-jira-plugin</id>
   <name>Maven JIRA Plugin</name>
-  <currentVersion>1.3</currentVersion>
+  <currentVersion>1.4-SNAPSHOT</currentVersion>
   <description>This plugin downloads issues from Jira and creates a report.</description>
   <shortDescription>Download issues from Jira</shortDescription>
   <developers/>
diff --git a/jira/xdocs/changes.xml b/jira/xdocs/changes.xml
index 91fd82f9..9dc50280 100644
--- a/jira/xdocs/changes.xml
+++ b/jira/xdocs/changes.xml
@@ -23,6 +23,9 @@
     <author email="brett@apache.org">Brett Porter</author>
   </properties>
   <body>
+    <release version="1.4-SNAPSHOT" date="In SVN">
+      <action dev="aheritier" type="fix">If a report isn't generated the plugin fails trying to replace entities in a not existing file.</action>
+    </release>
     <release version="1.3" date="2006-02-05">
       <action dev="ltheussl" type="fix" issue="MPJIRA-10">Jira plugin does not work with NTLM proxy.</action>
       <action dev="aheritier" type="update" issue="MAVEN-1739">Upgrade to HttpClient 3.0.</action>
