diff --git a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
index 58253542d8bb3f1f581e14a2982f906939e05742..b62e5b782f6db7679639468739b87e8bd6af9de9 100644
--- a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
+++ b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
@@ -89,18 +89,15 @@ public class I2PtoTCP implements Runnable {
 				}
 			}
 
-		} catch(UnknownHostException ex) {
-			// OOPS!
-		} catch(IOException ex) {
-			// OOPS!
+		} catch(Exception e) {
 		}
 		try {
 			I2P.close();
-		} catch(IOException ex) {
+		} catch(Exception e) {
 		}
 		try {
 			sock.close();
-		} catch(IOException ex) {
+		} catch(Exception e) {
 		}
 	}
 }
diff --git a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
index c1f1ba8e6d56e29c33edde0fbb35ac6d990dc650..51d279ee4bed634e93fd062ef544425fa06967d5 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
@@ -33,7 +33,6 @@ import java.net.Socket;
 import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.i2ptunnel.I2PTunnel;
 
@@ -56,9 +55,9 @@ public class TCPtoI2P implements Runnable {
 	 * 
 	 * @param in
 	 * @return line of text as a String
-	 * @throws java.io.IOException
+	 * @throws Exception 
 	 */
-	public static String Lread(InputStream in) throws IOException {
+	public static String Lread(InputStream in) throws Exception {
 		String S;
 		int b;
 		char c;
@@ -163,23 +162,19 @@ public class TCPtoI2P implements Runnable {
 					Emsg("ERROR " + e.toString(), out);
 				}
 
-			} catch(DataFormatException e) {
-				Emsg("ERROR " + e.toString(), out);
-			} catch(NullPointerException e) {
+			} catch(Exception e) {
 				Emsg("ERROR " + e.toString(), out);
 			}
 		} catch(IOException ioe) {
 		}
 		try {
 			I2P.close();
-		} catch(IOException ex) {
-		} catch(NullPointerException e) {
+		} catch(Exception e) {
 		}
 
 		try {
 			sock.close();
-		} catch(IOException ex) {
-		} catch(NullPointerException e) {
+		} catch(Exception e) {
 		}
 	}
 }