diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
index d38be61ec4..21618273db 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java
@@ -1415,8 +1415,6 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
                 //_log.error(getPrefix() + "Error generating keys to out", ioe);
                 //notifyEvent("genkeysResult", "error");
                 return;
-            } finally {
-                if(pubdest != null) try { pubdest.close(); } catch(IOException ioe) {}
             }
         } else if (args.length != 1) {
             l.log("genkeys <privkeyfile> [<pubkeyfile>]\n" +
@@ -1438,6 +1436,8 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging {
             l.log("Error generating keys - " + ioe.getMessage());
             //notifyEvent("genkeysResult", "error");
             //_log.error(getPrefix() + "Error generating keys", ioe);
+        } finally {
+            if(pubdest != null) try { pubdest.close(); } catch(IOException ioe) {}
         }
     }
 
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
index ff9d0a802d..02c5c3b0ed 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java
@@ -575,8 +575,6 @@ public class SOCKS5Server extends SOCKSServer {
                 throw new SOCKSException("Outproxy rejected request, response = " + reply);
             // throw away the address in the response
             // todo pass the response through?
-            out.close();
-            in.close();
         } catch (IOException e) {
             try { destSock.close(); } catch (IOException ioe) {}
             throw e;