diff --git a/api/net/sf/briar/api/ExceptionHandler.java b/api/net/sf/briar/api/ExceptionHandler.java
new file mode 100644
index 000000000..ccc91d094
--- /dev/null
+++ b/api/net/sf/briar/api/ExceptionHandler.java
@@ -0,0 +1,6 @@
+package net.sf.briar.api;
+
+public interface ExceptionHandler<E extends Exception> {
+
+	void handleException(E exception);
+}
diff --git a/api/net/sf/briar/api/transport/ConnectionRecogniser.java b/api/net/sf/briar/api/transport/ConnectionRecogniser.java
index 7e23e370a..aa448648c 100644
--- a/api/net/sf/briar/api/transport/ConnectionRecogniser.java
+++ b/api/net/sf/briar/api/transport/ConnectionRecogniser.java
@@ -1,5 +1,6 @@
 package net.sf.briar.api.transport;
 
+import net.sf.briar.api.ExceptionHandler;
 import net.sf.briar.api.db.DbException;
 import net.sf.briar.api.protocol.TransportId;
 
@@ -15,12 +16,10 @@ public interface ConnectionRecogniser {
 	 */
 	void acceptConnection(TransportId t, byte[] tag, Callback c);
 
-	interface Callback {
+	interface Callback extends ExceptionHandler<DbException> {
 
 		void connectionAccepted(ConnectionContext ctx);
 
 		void connectionRejected();
-
-		void handleException(DbException e);
 	}
 }
diff --git a/components/net/sf/briar/transport/ConnectionDispatcherImpl.java b/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
index e2a49f6bd..1415e242e 100644
--- a/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
+++ b/components/net/sf/briar/transport/ConnectionDispatcherImpl.java
@@ -58,7 +58,7 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
 			}
 
 			public void connectionRejected() {
-				r.dispose(false);
+				r.dispose(true);
 			}
 
 			public void handleException(DbException e) {
@@ -103,7 +103,7 @@ class ConnectionDispatcherImpl implements ConnectionDispatcher {
 			}
 
 			public void connectionRejected() {
-				s.dispose(false);
+				s.dispose(true);
 			}
 
 			public void handleException(DbException e) {