diff --git a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java index d246679f34bde1d6b755a37b66b7bb5a91743fb3..3a53be55268765cad58df32105b17e70ac0e0dc0 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java +++ b/router/java/src/net/i2p/router/tunnel/pool/TunnelPoolManager.java @@ -131,10 +131,14 @@ public class TunnelPoolManager implements TunnelManagerFacade { if (info != null) return info; } - info = _inboundExploratory.getTunnel(id); - if (info != null) return info; - info = _outboundExploratory.getTunnel(id); - if (info != null) return info; + if (_inboundExploratory != null) { + info = _inboundExploratory.getTunnel(id); + if (info != null) return info; + } + if (_outboundExploratory != null) { + info = _outboundExploratory.getTunnel(id); + if (info != null) return info; + } return null; }