diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
index 013fd0e1788b668daf062c40e3394531f183d149..5d8b45d8d915c7c6b8baee59322a824589fa0375 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/AbstractMailboxSession.java
@@ -252,7 +252,7 @@ public abstract class AbstractMailboxSession implements Runnable {
 
 		StreamContext ctx =
 				keyManager
-						.getStreamContext(targetContactId, MailboxConstants.ID);
+						.getStreamContext(c, MailboxConstants.ID);
 
 		if (ctx == null)
 			throw new IOException("Could not allocated stream context");
diff --git a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
index 0ef05af610d21df8386940f205fe48d761331f47..631878288d6b85973e5cd4d115c3c36b446eabe0 100644
--- a/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
+++ b/bramble-core/src/main/java/org/briarproject/bramble/mailbox/PrivateMailboxSession.java
@@ -3,6 +3,7 @@ package org.briarproject.bramble.mailbox;
 import org.briarproject.bramble.api.contact.ContactId;
 import org.briarproject.bramble.api.db.DatabaseComponent;
 import org.briarproject.bramble.api.db.DbException;
+import org.briarproject.bramble.api.mailbox.MailboxInfo;
 import org.briarproject.bramble.api.sync.SyncSessionFactory;
 import org.briarproject.bramble.api.transport.KeyManager;
 import org.briarproject.bramble.api.transport.StreamContext;
@@ -75,6 +76,8 @@ public class PrivateMailboxSession extends AbstractMailboxSession {
 			return;
 		}
 
+		if (encryptedStream == null)
+			return;
 		MailboxRequest req =
 				new MailboxRequestStore(mailboxInfo.getAliasId(),
 						encryptedStream);