diff --git a/router/java/src/net/i2p/router/client/ClientListenerRunner.java b/router/java/src/net/i2p/router/client/ClientListenerRunner.java
index 38105e9c966c1b41327faa7da08956aa91b9662d..0f26b8d00cc391cb13ae034b5d76957e28a47a42 100644
--- a/router/java/src/net/i2p/router/client/ClientListenerRunner.java
+++ b/router/java/src/net/i2p/router/client/ClientListenerRunner.java
@@ -43,7 +43,7 @@ public class ClientListenerRunner implements Runnable {
         _running = false;
         _listening = false;
         
-        String val = context.getProperty(BIND_ALL_INTERFACES, "False");
+        String val = context.getProperty(BIND_ALL_INTERFACES);
         _bindAllInterfaces = Boolean.valueOf(val).booleanValue();
     }
     
diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
index 543b5e29c4dd6d30e15cabf6f48f56ac47ec4e22..9e706beda02fcc7449cf19214a08eb722f7744fe 100644
--- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
+++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java
@@ -49,18 +49,8 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade {
     
     public void startup() {
         _log.info("Starting up the client subsystem");
-        String portStr = _context.router().getConfigSetting(PROP_CLIENT_PORT);
-        if (portStr != null) {
-            try {
-                int port = Integer.parseInt(portStr);
-                _manager = new ClientManager(_context, port);
-            } catch (NumberFormatException nfe) {
-                _log.error("Error setting the port: " + portStr + " is not valid", nfe);
-                _manager = new ClientManager(_context, DEFAULT_PORT);
-            }
-        } else {
-            _manager = new ClientManager(_context, DEFAULT_PORT);
-        }
+        int port = _context.getProperty(PROP_CLIENT_PORT, DEFAULT_PORT);
+        _manager = new ClientManager(_context, port);
     }    
     
     public void shutdown() {