diff --git a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java
index 002001d7e1be09390905538476e3b6b65eedf451..4c73abfe3787137a4a73231d86a27f32379be9d6 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/versioning/ClientVersioningManagerImpl.java
@@ -262,6 +262,7 @@ class ClientVersioningManagerImpl implements ClientVersioningManager, Client,
 			storeClientVersions(txn, newVersions);
 			return true;
 		}
+		if (ids.size() != 1) throw new DbException();
 		MessageId m = ids.iterator().next();
 		List<ClientVersion> oldVersions = loadClientVersions(txn, m);
 		if (oldVersions.equals(newVersions)) return false;