diff --git a/jira/plugin.jelly b/jira/plugin.jelly
index 25562eef..546de92f 100644
--- a/jira/plugin.jelly
+++ b/jira/plugin.jelly
@@ -23,7 +23,8 @@
   xmlns:define="jelly:define"
   xmlns:jira="jira"
   xmlns:maven="jelly:maven"
-  xmlns:doc="doc">
+  xmlns:doc="doc"
+  xmlns:ant="jelly:ant">
   
   <goal name="maven-jira-plugin:register">
     <doc:registerReport 
@@ -66,19 +67,31 @@
       />
     
     <mkdir dir="${maven.gen.docs}"/>
-    <doc:jslFile
-      input="${maven.build.dir}/jira/jira-results.xml"
-      output="${maven.gen.docs}/jira.xml"
-      stylesheet="${plugin.resources}/jira.jsl"
-      outputMode="xml"
-      prettyPrint="true"
-      />
     
-    <copy todir="${maven.docs.dest}/images/jira" overwrite="yes" filtering="yes">
-      <fileset dir="${plugin.resources}/images">
-        <include name="**/*.gif"/>
-      </fileset>
-    </copy>
+    <j:catch var="parseresult">
+      <doc:jslFile
+        input="${maven.build.dir}/jira/jira-results.xml"
+        output="${maven.gen.docs}/jira.xml"
+        stylesheet="${plugin.resources}/jira.jsl"
+        outputMode="xml"
+        prettyPrint="true"
+        />
+    </j:catch>
+    
+    <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>
+      </j:when>
+      <j:otherwise>
+        <!--  go on  -->
+        <copy todir="${maven.docs.dest}/images/jira" overwrite="yes" filtering="yes">
+          <fileset dir="${plugin.resources}/images">
+            <include name="**/*.gif"/>
+          </fileset>
+        </copy>
+      </j:otherwise>
+    </j:choose>
+    
   </goal> 
 
 </project>
diff --git a/jira/xdocs/changes.xml b/jira/xdocs/changes.xml
index f4e93b94..c58dad28 100644
--- a/jira/xdocs/changes.xml
+++ b/jira/xdocs/changes.xml
@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.2-SNAPSHOT" date="in SVN">
+      <action dev="fgiust" type="fix">Only log an error if the jira changes xml can't be parsed instead of throwing an Exception</action>
       <action dev="fgiust" type="fix" issue="MPJIRA-4">Make the Jira report work also using a fancy JIRA url like http://jira.codehaus.org/browse/MPJIRA (it doesn't require 
       the url with a numeric project id anymore)</action>
       <action dev="aheritier" type="update" issue="MAVEN-1712">Update dependencies to match ones in maven 1.1 core and to unify them between plugins. The following dependencies are updated : 
