diff --git a/pmd/plugin.jelly b/pmd/plugin.jelly
index 07d64000..fc2fb1b6 100644
--- a/pmd/plugin.jelly
+++ b/pmd/plugin.jelly
@@ -111,28 +111,35 @@
          violated and that causes the report generation to fail later on -->
     <echo file="${maven.build.dir}/pmd-raw-report.xml" 
         message="&lt;?xml version='1.0'?&gt;&lt;pmd/&gt;"/>
-    
-    <pmd rulesetfiles="${maven.pmd.rulesetfiles}">
-      <formatter type="xml" toFile="${maven.build.dir}/pmd-raw-report.xml"/>
-      <fileset dir="${pom.build.sourceDirectory}" 
-        includes="${maven.pmd.includes}"
-        excludes="${maven.pmd.excludes}">
 
-        <!-- FIXME: This is a bad cut and paste -->
-        <!-- handle source modifications -->
-        <j:forEach var="sm" items="${pom.build.sourceModifications}">
-          <available property="classPresent" classname="${sm.className}"/>
-          <j:if test="${classPresent != 'true'}">
-            <j:forEach var="exclude" items="${sm.excludes}">
-              <exclude name="${exclude}"/>
+    <j:choose>
+      <j:when test="${sourcesPresent == 'true'}">
+        <pmd rulesetfiles="${maven.pmd.rulesetfiles}">
+          <formatter type="xml" toFile="${maven.build.dir}/pmd-raw-report.xml"/>
+          <fileset dir="${pom.build.sourceDirectory}" 
+            includes="${maven.pmd.includes}"
+            excludes="${maven.pmd.excludes}">
+
+            <!-- FIXME: This is a bad cut and paste -->
+            <!-- handle source modifications -->
+            <j:forEach var="sm" items="${pom.build.sourceModifications}">
+              <available property="classPresent" classname="${sm.className}"/>
+              <j:if test="${classPresent != 'true'}">
+                <j:forEach var="exclude" items="${sm.excludes}">
+                  <exclude name="${exclude}"/>
+                </j:forEach>
+                <j:forEach var="include" items="${sm.includes}">
+                  <include name="${include}"/>
+                </j:forEach>
+              </j:if>
             </j:forEach>
-            <j:forEach var="include" items="${sm.includes}">
-              <include name="${include}"/>
-            </j:forEach>
-          </j:if>
-        </j:forEach>
-      </fileset>
-    </pmd>
+          </fileset>
+        </pmd>
+      </j:when>
+      <j:otherwise>
+        <ant:echo>No java source files to process.</ant:echo>
+      </j:otherwise>
+    </j:choose>
     
     <!-- Run JSL to transform the report into XDOC -->
           
@@ -149,7 +156,7 @@
     <!-- Generate CPD report if it is enabled -->
     <j:set var="enable" value="${maven.pmd.cpd.enable}"/>
 
-    <j:if test="${enable == 'true'}">
+    <j:if test="${enable == 'true' and sourcesPresent == 'true'}">
       <attainGoal name="pmd:cpd-report"/>
     </j:if>
   </goal>
diff --git a/pmd/xdocs/changes.xml b/pmd/xdocs/changes.xml
index 508c5705..2f54308b 100644
--- a/pmd/xdocs/changes.xml
+++ b/pmd/xdocs/changes.xml
@@ -25,6 +25,9 @@
     <author email="vmassol@apache.org">Vincent Massol</author>
   </properties>
   <body>
+    <release version="1.6-SNAPSHOT" date="in CVS">
+      <action dev="dion" issue="MPPMD-12" type="fix">Check sources are present before calling PMD.</action>
+    </release>
     <release version="1.5" date="2004-06-28">
       <action dev="brett" due-to="Joakim Erdfelt" issue="MPPMD-2" type="update">Upgrade to PMD 1.3, clean up and improve documentation.</action>
     </release>
