diff --git a/history.txt b/history.txt
index 2d801ea035..38d089d9ce 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,7 @@
-$Id: history.txt,v 1.87 2004/11/28 20:58:39 jrandom Exp $
+$Id: history.txt,v 1.88 2004/11/29 16:57:14 jrandom Exp $
+
+2004-11-29  jrandom
+    * Minor fixes to avoid unnecessary errors on shutdown (thanks susi!)
 
 2004-11-29  jrandom
     * Reduced contention for local client delivery
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 721ad96ee8..3c76d59174 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.92 $ $Date: 2004/11/28 20:58:39 $";
+    public final static String ID = "$Revision: 1.93 $ $Date: 2004/11/29 16:57:14 $";
     public final static String VERSION = "0.4.2";
-    public final static long BUILD = 5;
+    public final static long BUILD = 6;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);
diff --git a/router/java/src/net/i2p/router/transport/tcp/TCPConnectionEstablisher.java b/router/java/src/net/i2p/router/transport/tcp/TCPConnectionEstablisher.java
index 0229777b46..5a44300952 100644
--- a/router/java/src/net/i2p/router/transport/tcp/TCPConnectionEstablisher.java
+++ b/router/java/src/net/i2p/router/transport/tcp/TCPConnectionEstablisher.java
@@ -40,6 +40,7 @@ public class TCPConnectionEstablisher implements Runnable {
             if (con != null) {
                 _transport.connectionEstablished(con);
             } else {
+                if (!_context.router().isAlive()) return;
                 _transport.addConnectionErrorMessage(cb.getError());
                 Hash peer = info.getIdentity().getHash();
                 _context.profileManager().commErrorOccurred(peer);
diff --git a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
index 62b66877e7..60daddac6e 100644
--- a/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
+++ b/router/java/src/net/i2p/router/tunnelmanager/TunnelPool.java
@@ -2,6 +2,7 @@ package net.i2p.router.tunnelmanager;
 
 import java.io.IOException;
 import java.io.Writer;
+import java.util.Collections;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -152,7 +153,7 @@ class TunnelPool {
      *
      */
     public Set getManagedTunnelIds() {
-        if (!_isLive) return null;
+        if (!_isLive) return Collections.EMPTY_SET;
         Set ids = new HashSet(64);
         synchronized (_outboundTunnels) {
             ids.addAll(_outboundTunnels.keySet());