2 files changed, 12 insertions, 24 deletions

diff --git a/src/main/java/eu/siacs/conversations/services/AvatarService.java b/src/main/java/eu/siacs/conversations/services/AvatarService.java
index 70c1d4dd..3ac4462d 100644
--- a/src/main/java/eu/siacs/conversations/services/AvatarService.java
+++ b/src/main/java/eu/siacs/conversations/services/AvatarService.java
@@ -121,8 +121,8 @@ public class AvatarService {
 
 		if (count == 0) {
 			String name = mucOptions.getConversation().getName();
-			String letter = name.substring(0, 1);
-			int color = UIHelper.getColorForName(name);
+			final String letter = name.isEmpty() ? "X" : name.substring(0,1);
+			final int color = UIHelper.getColorForName(name);
 			drawTile(canvas, letter, color, 0, 0, size, size);
 		} else if (count == 1) {
 			drawTile(canvas, users.get(0), 0, 0, size, size);
@@ -212,15 +212,8 @@ public class AvatarService {
 		}
 		bitmap = Bitmap.createBitmap(size, size, Bitmap.Config.ARGB_8888);
 		Canvas canvas = new Canvas(bitmap);
-		String letter;
-		int color;
-		if (name.length() > 0) {
-			letter = name.substring(0, 1);
-			color = UIHelper.getColorForName(name);
-		} else {
-			letter = "X";
-			color = PLACEHOLDER_COLOR;
-		}
+		final String letter = name.isEmpty() ? "X" : name.substring(0,1);
+		final int color = UIHelper.getColorForName(name);
 		drawTile(canvas, letter, color, 0, 0, size, size);
 		mXmppConnectionService.getBitmapCache().put(KEY, bitmap);
 		return bitmap;
@@ -275,15 +268,8 @@ public class AvatarService {
 			}
 		}
 		String name = contact != null ? contact.getDisplayName() : user.getName();
-		String letter;
-		int color;
-		if (name.length() > 0) {
-			letter = name.substring(0, 1);
-			color = UIHelper.getColorForName(name);
-		} else {
-			letter = "X";
-			color = PLACEHOLDER_COLOR;
-		}
+		final String letter = name.isEmpty() ? "X" : name.substring(0,1);
+		final int color = UIHelper.getColorForName(name);
 		drawTile(canvas, letter, color, left, top, right, bottom);
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 128f61a1..9cc4c2c6 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -1301,10 +1301,12 @@ public class XmppConnectionService extends Service {
 		account.pendingConferenceJoins.remove(conversation);
 		account.pendingConferenceLeaves.remove(conversation);
 		if (account.getStatus() == Account.State.ONLINE) {
-			Log.d(Config.LOGTAG,
-					"joining conversation " + conversation.getContactJid());
-			String nick = conversation.getMucOptions().getProposedNick();
-			Jid joinJid = conversation.getMucOptions().createJoinJid(nick);
+			final String nick = conversation.getMucOptions().getProposedNick();
+			final Jid joinJid = conversation.getMucOptions().createJoinJid(nick);
+			if (joinJid == null) {
+				return; //safety net
+			}
+			Log.d(Config.LOGTAG,account.getJid().toBareJid().toString()+": joining conversation " + joinJid.toString());
 			PresencePacket packet = new PresencePacket();
 			packet.setFrom(conversation.getAccount().getJid());
 			packet.setTo(joinJid);