diff --git a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
index a3f5434b..a20c4254 100644
--- a/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
+++ b/jxr/src/main/org/apache/maven/jxr/CodeTransform.java
@@ -647,37 +647,39 @@ public class CodeTransform implements Serializable
 
         overview.append("<table bgcolor=\"#FFFFCC\" cellpadding=\"0\" cellspacing=\"0\" border=\"0\" width=\"100%\">");
 
-        //get the URI to get Javadoc info.
-        StringBuffer javadocURI = new StringBuffer()
-            .append(getPackageRoot())
-            .append(javadocLinkDir);
+        if (javadocLinkDir != null) {
+          //get the URI to get Javadoc info.
+          StringBuffer javadocURI = new StringBuffer()
+              .append(getPackageRoot())
+              .append(javadocLinkDir);
 
-        try
-        {
-            JavaFile jf = FileManager.getInstance().getFile(this.getCurrentFilename());
+          try
+          {
+              JavaFile jf = FileManager.getInstance().getFile(this.getCurrentFilename());
 
-            javadocURI.append(StringUtils.replace(jf.getPackageType().getName(), ".", "/"));
-            javadocURI.append("/");
-            if (jf.getClassType() != null)
-            {
-                javadocURI.append(jf.getClassType().getName());
-            }
-            else
-            {
-                System.out.println(this.getCurrentFilename());
-            }
-            javadocURI.append(".html");
+              javadocURI.append(StringUtils.replace(jf.getPackageType().getName(), ".", "/"));
+              javadocURI.append("/");
+              if (jf.getClassType() != null)
+              {
+                  javadocURI.append(jf.getClassType().getName());
+              }
+              else
+              {
+                  System.out.println(this.getCurrentFilename());
+              }
+              javadocURI.append(".html");
 
+          }
+          catch (IOException e)
+          {
+              e.printStackTrace();
+          }
+
+          String javadocHREF = "<a href=\"" + javadocURI + "\">View Javadoc</a>";
+
+          //get the generation time...
+          overview.append(javadocHREF);
         }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-
-        String javadocHREF = "<a href=\"" + javadocURI + "\">View Javadoc</a>";
-
-        //get the generation time...
-        overview.append(javadocHREF);
         overview.append("</table>");
         return overview.toString();
     }
diff --git a/jxr/src/main/org/apache/maven/jxr/JxrBean.java b/jxr/src/main/org/apache/maven/jxr/JxrBean.java
index 2da3c924..80850f29 100644
--- a/jxr/src/main/org/apache/maven/jxr/JxrBean.java
+++ b/jxr/src/main/org/apache/maven/jxr/JxrBean.java
@@ -80,7 +80,7 @@ import org.apache.commons.logging.LogFactory;
  * @author <a href="mailto:lucas@collab.net">Josh Lucas</a>
  * @author <a href="mailto:jason@zenplex.com">Jason van Zyl</a>
  * @author <a href="mailto:brian@brainslug.com">Brian Leonard</a>
- * @version $Id: JxrBean.java,v 1.2 2003/01/25 10:04:24 evenisse Exp $
+ * @version $Id: JxrBean.java,v 1.3 2003/02/05 11:23:25 bwalding Exp $
  */
 public class JxrBean
 {
@@ -119,7 +119,10 @@ public class JxrBean
     {
         // get a relative link to the javadocs
         String javadocLinkDir = null;
-        javadocLinkDir = getRelativeLink(destDir, javadocDir);
+        System.out.println("javadocdir:" + javadocLinkDir);
+        if (javadocDir != null) {
+            javadocLinkDir = getRelativeLink(destDir, javadocDir);
+        }
         
         // first collect package and class info
         PackageManager pkgmgr = new PackageManager();
@@ -285,6 +288,8 @@ public class JxrBean
     /**
      * JavadocDir is used to cross-reference the source code with
      * the appropriate javadoc pages.
+     * 
+     * If <code>null</code>, no javadoc link will be added.
      *
      * @param javadocDir The root directory containing javadocs
      */