diff --git a/dashboard/plugin.jelly b/dashboard/plugin.jelly
index 4564b110..46f6894f 100644
--- a/dashboard/plugin.jelly
+++ b/dashboard/plugin.jelly
@@ -119,11 +119,21 @@
     <a:dirname property="xmlReportDir" file="${maven.dashboard.report.xml}"/>
     <a:mkdir dir="${xmlReportDir}"/>
 
+    <!-- Check if dashboard-single.xml has been generated for each reactor project -->
+    <j:forEach var="reactorProject" items="${reactorProjects}">
+      <j:set var="dashboard.single.report.available" value="false"/>
+      <u:available file="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml">
+        <j:set var="dashboard.single.report.available" value="true"/>
+      </u:available>
+      <j:if test="${dashboard.single.report.available == 'false'}">
+        <echo>***  WARNING: no file dashboard-single.xml found for reactor project: ${reactorProject}</echo>
+      </j:if>
+    </j:forEach>
+
     <j:file name="${maven.dashboard.report.xml}" prettyPrint="true" 
         xmlns="dashboard">
       <dashboard>
         <j:forEach var="reactorProject" items="${reactorProjects}">
-          <j:set var="dashboard.single.report.available" value="false"/>
           <u:available 
               file="${reactorProject.context.getVariable('maven.build.dir')}/dashboard-single.xml">
               <!-- FIXME: this should be maven.dashboard.report.single -->
@@ -143,13 +153,7 @@
               <x:parse var="doc" xml="${dashboardAsFile}"/>           
               <x:copyOf select="$doc//aggregator"/>
             </x:element>
-            <j:set var="dashboard.single.report.available" value="true"/>
           </u:available>
-          <j:if test="${dashboard.single.report.available == 'false'}">
-            <echo>
-***  WARNING: no file dashboard-single.xml found for reactor project: ${reactorProject}
-            </echo>
-          </j:if>
         </j:forEach>
       </dashboard>
     </j:file>