diff --git a/xdoc/src/plugin-resources/templates/cvs-usage.xml b/xdoc/src/plugin-resources/templates/cvs-usage.xml
index 5bf43d85..7f62a30d 100644
--- a/xdoc/src/plugin-resources/templates/cvs-usage.xml
+++ b/xdoc/src/plugin-resources/templates/cvs-usage.xml
@@ -1,9 +1,6 @@
 <?xml version="1.0"?>
 <document>
   
-  #set ($conn = $project.repository.cvsRoot)
-  #set ($module = $project.repository.cvsModule)
-  #set ($url = $escape.getText($project.repository.url))
   
   <properties>
     <author email="turbine-maven-dev@jakarta.apache.org">Maven</author>
@@ -11,6 +8,20 @@
   </properties>
 
   <body>
+  	#set ($repository = $project.repository)
+  	
+  	#if (!$repository)
+      <section name="Repository">
+        <p>
+          No SCM repository is defined.
+        </p>
+      </section>
+  	#else
+  	
+    #set ($conn = $repository.cvsRoot)
+    #set ($module = $repository.cvsModule)
+    #set ($url = $escape.getText($project.repository.url))
+  
     <section name="Web Access">
       <p>
         <a href="$url">$url</a>
@@ -50,6 +61,7 @@
       </p>
 
     </section>
+    #end
   </body>
 
 </document>