diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml
index b625963b..229c59e0 100644
--- a/xdoc/src/plugin-resources/templates/cvs-usage.xml
+++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml
@@ -34,10 +34,9 @@
         </p>
       </section>
     #else
-    
-      #set ($url = $escape.getText($repository.url))
-  
+     
       #if ($repository.url && $repository.url != '')
+      #set ($url = $escape.getText($repository.url))
       <section name="Web Access">
         <p>
           <a href="$url">$url</a>
diff --git a/xdoc/src/plugin-resources/templates/issue-tracking.xml b/xdoc/src/plugin-resources/templates/issue-tracking.xml
index 41b4f347..eb5ed36d 100644
--- a/xdoc/src/plugin-resources/templates/issue-tracking.xml
+++ b/xdoc/src/plugin-resources/templates/issue-tracking.xml
@@ -26,8 +26,10 @@
   <body>
     <section name="Issue Tracking">
       <p>
+      #if ($project.issueTrackingUrl && $project.issueTrackingUrl != '')
         #set ($url = $escape.getText($project.issueTrackingUrl))
         <a href="$url">$url</a>
+      #end
       </p>
     </section>
   </body>
diff --git a/xdoc/src/plugin-resources/templates/scm/cvs.xml b/xdoc/src/plugin-resources/templates/scm/cvs.xml
index cb1bbf06..4c9ef686 100644
--- a/xdoc/src/plugin-resources/templates/scm/cvs.xml
+++ b/xdoc/src/plugin-resources/templates/scm/cvs.xml
@@ -34,10 +34,9 @@
         </p>
       </section>
     #else
-    
-      #set ($url = $escape.getText($repository.url))
-  
+ 
       #if ($repository.url && $repository.url != '')
+      #set ($url = $escape.getText($repository.url))
       <section name="Web Access">
         <p>
           <a href="$url">$url</a>