diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java
index ca4a1e708..4530e8378 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/ConfigTunnelsHelper.java
@@ -6,6 +6,7 @@ import java.util.Set;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.router.TunnelPoolSettings;
+import net.i2p.router.transport.TransportUtil;
 import net.i2p.router.web.HelperBase;
 
 public class ConfigTunnelsHelper extends HelperBase {
@@ -77,13 +78,23 @@ public class ConfigTunnelsHelper extends HelperBase {
         if (in.getLength() <= 0 ||
             in.getLength() + in.getLengthVariance() <= 0 ||
             out.getLength() <= 0 ||
-            out.getLength() + out.getLengthVariance() <= 0)
+            out.getLength() + out.getLengthVariance() <= 0) {
             buf.append("<tr><th colspan=\"3\"><font color=\"red\">" + _t("ANONYMITY WARNING - Settings include 0-hop tunnels.") + "</font></th></tr>");
-        else if (in.getLength() <= 1 ||
+            if (TransportUtil.getIPv6Config(_context, "SSU") == TransportUtil.IPv6Config.IPV6_ONLY) {
+                // rare, don't bother translating
+                buf.append("<tr><th colspan=\"3\"><font color=\"red\">WARNING - 0-hop tunnels not recommended for IPv6-only routers.</font></th></tr>");
+            }
+            if ((in.getLength() <= 0 || in.getLength() + in.getLengthVariance() <= 0) &&
+                _context.router().isHidden()) {
+                // rare, don't bother translating
+                buf.append("<tr><th colspan=\"3\"><font color=\"red\">WARNING - Inbound 0-hop tunnels not recommended for hidden routers.</font></th></tr>");
+            }
+        } else if (in.getLength() <= 1 ||
             in.getLength() + in.getLengthVariance() <= 1 ||
             out.getLength() <= 1 ||
-            out.getLength() + out.getLengthVariance() <= 1)
+            out.getLength() + out.getLengthVariance() <= 1) {
             buf.append("<tr><th colspan=\"3\"><font color=\"red\">" + _t("ANONYMITY WARNING - Settings include 1-hop tunnels.") + "</font></th></tr>");
+        }
         if (in.getLength() + Math.abs(in.getLengthVariance()) >= WARN_LENGTH ||
             out.getLength() + Math.abs(out.getLengthVariance()) >= WARN_LENGTH)
             buf.append("<tr><th colspan=\"3\"><font color=\"red\">" + _t("PERFORMANCE WARNING - Settings include very long tunnels.") + "</font></th></tr>");
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
index 80a749bb8..ffc44d104 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/helpers/NetDbRenderer.java
@@ -15,6 +15,7 @@ import java.math.BigInteger;         // debug
 import java.text.Collator;
 import java.text.DecimalFormat;      // debug
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
@@ -647,20 +648,25 @@ class NetDbRenderer {
         buf.append("<b>").append(_t("Signing Key")).append(":</b> ")
            .append(info.getIdentity().getSigningPublicKey().getType().toString());
         buf.append("</td></tr>\n<tr>")
-           .append("<td><b>" + _t("Address(es)") + ":</b></td>")
+           .append("<td><b>" + _t("Addresses") + ":</b></td>")
            .append("<td colspan=\"2\" class=\"netdb_addresses\">");
-        for (RouterAddress addr : info.getAddresses()) {
-            String style = addr.getTransportStyle();
-            buf.append("<br><b class=\"netdb_transport\">").append(DataHelper.stripHTML(style)).append(":</b>");
-            int cost = addr.getCost();
-            if (!((style.equals("SSU") && cost == 5) || (style.equals("NTCP") && cost == 10)))
-                buf.append("&nbsp;<span class=\"netdb_name\">").append(_t("cost")).append("</span>: <span class=\"netdb_info\">").append("" + cost).append("</span>&nbsp;");
-            Map<Object, Object> p = addr.getOptionsMap();
-            for (Map.Entry<Object, Object> e : p.entrySet()) {
-                String name = (String) e.getKey();
-                String val = (String) e.getValue();
-                buf.append(" <span class=\"nowrap\"><span class=\"netdb_name\">").append(_t(DataHelper.stripHTML(name)))
-                   .append(":</span> <span class=\"netdb_info\">").append(DataHelper.stripHTML(val)).append("</span></span>&nbsp;");
+        Collection<RouterAddress> addrs = info.getAddresses();
+        if (addrs.isEmpty()) {
+            buf.append(_t("none"));
+        } else {
+            for (RouterAddress addr : info.getAddresses()) {
+                String style = addr.getTransportStyle();
+                buf.append("<br><b class=\"netdb_transport\">").append(DataHelper.stripHTML(style)).append(":</b>");
+                int cost = addr.getCost();
+                if (!((style.equals("SSU") && cost == 5) || (style.equals("NTCP") && cost == 10)))
+                    buf.append("&nbsp;<span class=\"netdb_name\">").append(_t("cost")).append("</span>: <span class=\"netdb_info\">").append("" + cost).append("</span>&nbsp;");
+                Map<Object, Object> p = addr.getOptionsMap();
+                for (Map.Entry<Object, Object> e : p.entrySet()) {
+                    String name = (String) e.getKey();
+                    String val = (String) e.getValue();
+                    buf.append(" <span class=\"nowrap\"><span class=\"netdb_name\">").append(_t(DataHelper.stripHTML(name)))
+                       .append(":</span> <span class=\"netdb_info\">").append(DataHelper.stripHTML(val)).append("</span></span>&nbsp;");
+                }
             }
         }
         buf.append("</td></tr>\n");