diff --git a/core/java/src/net/i2p/data/LeaseSet.java b/core/java/src/net/i2p/data/LeaseSet.java
index 8a05dd9569bb744599f7d0e8dc1e51d8e6a786f4..66d10da94471cf3bbcea595eb8e6246fc23be417 100644
--- a/core/java/src/net/i2p/data/LeaseSet.java
+++ b/core/java/src/net/i2p/data/LeaseSet.java
@@ -67,7 +67,7 @@ public class LeaseSet extends DataStructureImpl {
     private boolean _checked;
 
     /** This seems like plenty  */
-    private final static int MAX_LEASES = 6;
+    public final static int MAX_LEASES = 6;
 
     public LeaseSet() {
         setDestination(null);
diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
index 8319052999e501792a23ed8d1e420e13d755d5d1..8ce5859df0877bcfb4b5c096fb74ff9b0e9aacd4 100644
--- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPool.java
@@ -65,6 +65,9 @@ public class TunnelPool {
     }
     
     public void startup() {
+        synchronized (_inProgress) {
+            _inProgress.clear();
+        }
         _alive = true;
         _started = System.currentTimeMillis();
         _lastRateUpdate = _started;
@@ -91,6 +94,9 @@ public class TunnelPool {
         _lastSelectionPeriod = 0;
         _lastSelected = null;
         _context.statManager().removeRateStat(_rateName);
+        synchronized (_inProgress) {
+            _inProgress.clear();
+        }
     }
 
     TunnelPoolManager getManager() { return _manager; }
@@ -293,7 +299,9 @@ public class TunnelPool {
         int remaining = 0;
         LeaseSet ls = null;
         synchronized (_tunnels) {
-            _tunnels.remove(info);
+            boolean removed = _tunnels.remove(info);
+            if (!removed)
+                return;
             if (_settings.isInbound() && (_settings.getDestination() != null) )
                 ls = locked_buildNewLeaseSet();
             remaining = _tunnels.size();
@@ -334,12 +342,15 @@ public class TunnelPool {
         }
     }
 
+    /** This may be called multiple times from TestJob */
     public void tunnelFailed(PooledTunnelCreatorConfig cfg) {
         if (_log.shouldLog(Log.WARN))
             _log.warn(toString() + ": Tunnel failed: " + cfg);
         LeaseSet ls = null;
         synchronized (_tunnels) {
-            _tunnels.remove(cfg);
+            boolean removed = _tunnels.remove(cfg);
+            if (!removed)
+                return;
             if (_settings.isInbound() && (_settings.getDestination() != null) )
                 ls = locked_buildNewLeaseSet();
             if (_lastSelected == cfg) {
@@ -465,7 +476,7 @@ public class TunnelPool {
         if (!_alive)
             return null;
 
-        int wanted = _settings.getQuantity();
+        int wanted = Math.min(_settings.getQuantity(), LeaseSet.MAX_LEASES);
         if (_tunnels.size() < wanted) {
             if (_log.shouldLog(Log.WARN))
                 _log.warn(toString() + ": Not enough tunnels (" + _tunnels.size() + ", wanted " + wanted + ")");