2 files changed, 9 insertions, 8 deletions
diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 1125859c..70c1d4dd 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -113,7 +113,7 @@ public class AvatarService {
 		if (bitmap != null) {
 			return bitmap;
 		}
-		List<MucOptions.User> users = mucOptions.getUsers();
+		final List<MucOptions.User> users = new ArrayList<>(mucOptions.getUsers());
 		int count = users.size();
 		bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(bitmap);
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 12237f73..128f61a1 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -813,13 +813,11 @@ public class XmppConnectionService extends Service {
 							Conversation conversation = find(bookmark);
 							if (conversation != null) {
 								conversation.setBookmark(bookmark);
-							} else {
-								if (bookmark.autojoin()) {
-									conversation = findOrCreateConversation(
-											account, bookmark.getJid(), true);
-									conversation.setBookmark(bookmark);
-									joinMuc(conversation);
-								}
+							} else if (bookmark.autojoin() && bookmark.getJid() != null) {
+								conversation = findOrCreateConversation(
+										account, bookmark.getJid(), true);
+								conversation.setBookmark(bookmark);
+								joinMuc(conversation);
 							}
 						}
 					}
@@ -980,6 +978,9 @@ public class XmppConnectionService extends Service {
 	public Conversation find(final List<Conversation> haystack,
 			final Account account,
 			final Jid jid) {
+		if (jid == null ) {
+			return null;
+		}
 		for (Conversation conversation : haystack) {
 			if ((account == null || conversation.getAccount() == account)
 					&& (conversation.getContactJid().toBareJid().equals(jid.toBareJid()))) {