diff --git a/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java b/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
index 9083b7945..c2b4c8b19 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/mms/MessageGroupContext.java
@@ -128,7 +128,9 @@ public final class MessageGroupContext {
     public @NonNull List<RecipientId> getMembersListExcludingSelf() {
       RecipientId selfId = Recipient.self().getId();
 
-      return Stream.of(groupContext.getMembersE164List())
+      return Stream.of(groupContext.getMembersList())
+                   .map(GroupContext.Member::getE164)
+                   .withoutNulls()
                    .map(e164 -> new SignalServiceAddress(null, e164))
                    .map(RecipientId::from)
                    .filterNot(selfId::equals)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
index 8cece8d99..73da984d0 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/GroupUtil.java
@@ -133,7 +133,7 @@ public final class GroupUtil {
                                                                     members.size(), toString(members)));
       }
 
-      if (title != null && !title.trim().isEmpty()) {
+      if (!title.trim().isEmpty()) {
         if (members != null) description.append(" ");
         else                 description.append("\n");
         description.append(context.getString(R.string.GroupUtil_group_name_is_now, title));
diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java b/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
index 986b8da9e..779bf3961 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/StringUtil.java
@@ -137,6 +137,10 @@ public final class StringUtil {
    * https://www.w3.org/International/questions/qa-bidi-unicode-controls
    */
   public static @NonNull String isolateBidi(@NonNull String text) {
+    if (text.isEmpty()) {
+      return text;
+    }
+
     int overrideCount      = 0;
     int overrideCloseCount = 0;
     int isolateCount       = 0;