diff --git a/briar-api/src/org/briarproject/api/clients/ProtocolStateException.java b/briar-api/src/org/briarproject/api/clients/ProtocolStateException.java
new file mode 100644
index 0000000000000000000000000000000000000000..f7b072abfc620b9a46357645066605358530946e
--- /dev/null
+++ b/briar-api/src/org/briarproject/api/clients/ProtocolStateException.java
@@ -0,0 +1,11 @@
+package org.briarproject.api.clients;
+
+import org.briarproject.api.db.DbException;
+
+/**
+ * Thrown when a database operation is attempted as part of a protocol session
+ * and the operation is not applicable to the current protocol state.
+ */
+public class ProtocolStateException extends DbException {
+
+}
diff --git a/briar-api/src/org/briarproject/api/db/ContactExistsException.java b/briar-api/src/org/briarproject/api/db/ContactExistsException.java
index 6b4c283f5af49fbc311c818ad63bfbd75853db9a..8e27d9cc8b867f92862c62a6e1ee6d6b0322f7bb 100644
--- a/briar-api/src/org/briarproject/api/db/ContactExistsException.java
+++ b/briar-api/src/org/briarproject/api/db/ContactExistsException.java
@@ -6,5 +6,4 @@ package org.briarproject.api.db;
  */
 public class ContactExistsException extends DbException {
 
-	private static final long serialVersionUID = -6658762011691502411L;
 }
diff --git a/briar-api/src/org/briarproject/api/db/DbClosedException.java b/briar-api/src/org/briarproject/api/db/DbClosedException.java
index decccf5e7bc2ba03038475a9a3d147eddc3e9dfe..c8fbf68233cc1383d3d169526287a964455c7869 100644
--- a/briar-api/src/org/briarproject/api/db/DbClosedException.java
+++ b/briar-api/src/org/briarproject/api/db/DbClosedException.java
@@ -1,7 +1,8 @@
 package org.briarproject.api.db;
 
-/** Thrown when a database operation is attempted and the database is closed. */
+/**
+ * Thrown when a database operation is attempted and the database is closed.
+ */
 public class DbClosedException extends DbException {
 
-	private static final long serialVersionUID = -3679248177625310653L;
 }
diff --git a/briar-api/src/org/briarproject/api/db/DbException.java b/briar-api/src/org/briarproject/api/db/DbException.java
index d214d45e53eaad11037f406e9046ccf23dfa63e3..f111f9517bcc11d3b78b06a75563e006582b7439 100644
--- a/briar-api/src/org/briarproject/api/db/DbException.java
+++ b/briar-api/src/org/briarproject/api/db/DbException.java
@@ -2,9 +2,8 @@ package org.briarproject.api.db;
 
 public class DbException extends Exception {
 
-	private static final long serialVersionUID = 3706581789209939441L;
-
-	public DbException() {}
+	public DbException() {
+	}
 
 	public DbException(Throwable t) {
 		super(t);
diff --git a/briar-api/src/org/briarproject/api/db/NoSuchContactException.java b/briar-api/src/org/briarproject/api/db/NoSuchContactException.java
index 6743521b48bd0455b438f509774b04160c78e580..9c2f5400b9da3520fd138014487b487b05c6f8be 100644
--- a/briar-api/src/org/briarproject/api/db/NoSuchContactException.java
+++ b/briar-api/src/org/briarproject/api/db/NoSuchContactException.java
@@ -7,5 +7,4 @@ package org.briarproject.api.db;
  */
 public class NoSuchContactException extends DbException {
 
-	private static final long serialVersionUID = -7048538231308207386L;
 }
diff --git a/briar-api/src/org/briarproject/api/db/NoSuchGroupException.java b/briar-api/src/org/briarproject/api/db/NoSuchGroupException.java
index 17e67f5648d86fcce61275f01fdcd89a3d1b564b..89222f58c79b6e880ddb324868850f949e4f3801 100644
--- a/briar-api/src/org/briarproject/api/db/NoSuchGroupException.java
+++ b/briar-api/src/org/briarproject/api/db/NoSuchGroupException.java
@@ -7,5 +7,4 @@ package org.briarproject.api.db;
  */
 public class NoSuchGroupException extends DbException {
 
-	private static final long serialVersionUID = -5494178507342571697L;
 }
diff --git a/briar-api/src/org/briarproject/api/db/NoSuchLocalAuthorException.java b/briar-api/src/org/briarproject/api/db/NoSuchLocalAuthorException.java
index 239e03cda6b1643fec731eb2917ef81e4c3fc996..91f4aabe9195348e62b22d8766a2b5d37f11e4ab 100644
--- a/briar-api/src/org/briarproject/api/db/NoSuchLocalAuthorException.java
+++ b/briar-api/src/org/briarproject/api/db/NoSuchLocalAuthorException.java
@@ -7,5 +7,4 @@ package org.briarproject.api.db;
  */
 public class NoSuchLocalAuthorException extends DbException {
 
-	private static final long serialVersionUID = 494398665376703860L;
 }
diff --git a/briar-api/src/org/briarproject/api/db/NoSuchMessageException.java b/briar-api/src/org/briarproject/api/db/NoSuchMessageException.java
index a28dbe02b21de44d6509d48e6ba8715c6e884135..d7a5909e93409815377b1d50125656d7e58c5ca6 100644
--- a/briar-api/src/org/briarproject/api/db/NoSuchMessageException.java
+++ b/briar-api/src/org/briarproject/api/db/NoSuchMessageException.java
@@ -7,5 +7,4 @@ package org.briarproject.api.db;
  */
 public class NoSuchMessageException extends DbException {
 
-	private static final long serialVersionUID = 9191508339698803848L;
 }
diff --git a/briar-api/src/org/briarproject/api/db/NoSuchTransportException.java b/briar-api/src/org/briarproject/api/db/NoSuchTransportException.java
index 4c9c6ca1281192aa156e1540babd44ec44e2eafd..d68a2cc30b2fd17a3b9f6333bbddae7853ccce13 100644
--- a/briar-api/src/org/briarproject/api/db/NoSuchTransportException.java
+++ b/briar-api/src/org/briarproject/api/db/NoSuchTransportException.java
@@ -7,5 +7,4 @@ package org.briarproject.api.db;
  */
 public class NoSuchTransportException extends DbException {
 
-	private static final long serialVersionUID = -6274982612759573100L;
 }