diff --git a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
index f2334fb6b..001489918 100644
--- a/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
+++ b/apps/httptunnel/java/src/net/i2p/httptunnel/handler/EepHandler.java
@@ -5,6 +5,7 @@ import java.io.BufferedOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
+import java.net.SocketException;
 
 import net.i2p.I2PException;
 import net.i2p.client.naming.NamingService;
@@ -94,9 +95,15 @@ public class EepHandler {
             written = true;
             out.write(filtered);
             out.flush();
+        } catch (SocketException ex) {
+            _log.error("Error while handling eepsite request");
+            return written;
         } catch (IOException ex) {
             _log.error("Error while handling eepsite request");
             return written;
+        } catch (InterruptedException ex) {
+            _log.error("Error while handling eepsite request");
+            return written;
         } catch (I2PException ex) {
             _log.error("Error while handling eepsite request");
             return written;
@@ -105,4 +112,4 @@ public class EepHandler {
         }
         return true;
     }
-}
\ No newline at end of file
+}