diff --git a/xdoc/src/plugin-resources/navigation.jelly b/xdoc/src/plugin-resources/navigation.jelly
index 58c6fc49..aa394fdd 100644
--- a/xdoc/src/plugin-resources/navigation.jelly
+++ b/xdoc/src/plugin-resources/navigation.jelly
@@ -35,7 +35,7 @@
 
                     <!-- Only display a "Downloads" menu link if the 
                         maven.xdoc.distributionUrl has been defined -->
-                    <j:if test="${context.getVariable('maven.xdoc.distributionUrl') != null}">
+                    <j:if test="${!empty(context.getVariable('maven.xdoc.distributionUrl'))}">
                         <item key="navigation.menu.item.downloads"
                             bundle="plugin-resources.templates.templates"
                             name="Downloads" href="/downloads.html" />
diff --git a/xdoc/src/plugin-resources/templates/downloads.jelly b/xdoc/src/plugin-resources/templates/downloads.jelly
index 6d5709d9..dd6d1f4d 100644
--- a/xdoc/src/plugin-resources/templates/downloads.jelly
+++ b/xdoc/src/plugin-resources/templates/downloads.jelly
@@ -39,7 +39,7 @@
              property is not defined -->
         <j:choose>
 
-          <j:when test="${context.getVariable('maven.xdoc.distributionUrl') == null}">
+          <j:when test="${empty(context.getVariable('maven.xdoc.distributionUrl'))}">
             <p>
               You must define the <code>maven.xdoc.distributionUrl</code> 
               property if you wish to generate the download report.