merge of '306029c0c1bb9b7d62fcfdaeddd47bff7db82f66'

and 'c14952061dd61ddd6638f0a3655dd818f0a3db8e'

apps/routerconsole/java/src/net/i2p/router/web/TunnelRenderer.java

@@ -306,6 +306,10 @@ public class TunnelRenderer {
             String lc = this.comm.getCountry(l);
             String rc = this.comm.getCountry(r);
             
+            // make them non-null
+            lc = (lc == null) ? "zzzz" : lc;
+            rc = (rc == null) ? "zzzz" : rc;
+            
             // let String handle the rest
             return lc.compareTo(rc);
         }