diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
index 4fbafbc23..029435efa 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java
@@ -362,7 +362,7 @@ public class I2PTunnelConnectClient extends I2PTunnelHTTPClientBase implements R
         } finally {
             // only because we are running it inline
             closeSocket(s);
-            try { i2ps.close(); } catch (IOException ioe) {}
+            if (i2ps != null) try { i2ps.close(); } catch (IOException ioe) {}
         }
     }
 
diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
index 0b1cd4159..f40c5072a 100644
--- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
+++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java
@@ -1334,7 +1334,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelHTTPClientBase implements Runn
         } finally {
             // only because we are running it inline
             closeSocket(s);
-            try { i2ps.close(); } catch (IOException ioe) {}
+            if (i2ps != null) try { i2ps.close(); } catch (IOException ioe) {}
         }
     }