diff --git a/jdepend/project.xml b/jdepend/project.xml
index ac6b88ba..a97c40e6 100644
--- a/jdepend/project.xml
+++ b/jdepend/project.xml
@@ -82,6 +82,14 @@
         <role>Java Developer</role>
       </roles>
     </developer>
+    <developer>
+      <name>Lukas Theussl</name>
+      <id>ltheussl</id>
+      <email>ltheussl@apache.org</email>
+      <roles>
+        <role>Developer</role>
+      </roles>
+    </developer>
   </developers>
   <dependencies>
     <dependency>
diff --git a/jdepend/src/plugin-resources/jdepend.jsl b/jdepend/src/plugin-resources/jdepend.jsl
index 2c9c48a3..9b62bf7a 100644
--- a/jdepend/src/plugin-resources/jdepend.jsl
+++ b/jdepend/src/plugin-resources/jdepend.jsl
@@ -256,7 +256,7 @@
           <jdepend:nav/>
           <x:set var="packages" select="Cycles/Package"/>
           <j:choose>
-            <j:when test="${size(packages) == 0}">
+            <j:when test="${packages == null || size(packages) == 0}">
               <p>There are no cyclic dependencies.</p>
             </j:when>
             <j:otherwise>
diff --git a/jdepend/xdocs/changes.xml b/jdepend/xdocs/changes.xml
index 3641c16a..eaabb43a 100644
--- a/jdepend/xdocs/changes.xml
+++ b/jdepend/xdocs/changes.xml
@@ -24,6 +24,9 @@
     <author email="evenisse@ifrance.com">Emmanuel Venisse</author>
   </properties>
   <body>
+    <release version="1.5.1" date="in SVN">
+      <action dev="ltheussl" type="fix" issue="MPJDEPEND-4" due-to="Alexey Demakov">Exception in jsl when there are no cyclic dependencies.</action>
+    </release>
     <release version="1.5" date="2004-05-15">
       <action dev="brett" type="fix" issue="MPXDOC-16">Upgrade to JDepend for bugfixes.</action>
     </release>
