diff --git a/app/src/main/java/org/thoughtcrime/securesms/util/MockDataGenerator.kt b/app/src/main/java/org/thoughtcrime/securesms/util/MockDataGenerator.kt
index 712e393f17..02bce0ad08 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/util/MockDataGenerator.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/util/MockDataGenerator.kt
@@ -239,8 +239,7 @@ object MockDataGenerator {
                 // Add the group created message
                 if (userSessionId == adminUserId) {
                     storage.insertOutgoingInfoMessage(context, groupId, SignalServiceGroup.Type.CREATION, groupName, members, listOf(adminUserId), threadId, (timestampNow - (numMessages * 5000)))
-                }
-                else {
+                } else {
                     storage.insertIncomingInfoMessage(context, adminUserId, groupId, SignalServiceGroup.Type.CREATION, groupName, members, listOf(adminUserId), (timestampNow - (numMessages * 5000)))
                 }
 
diff --git a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
index 12c1c43d6f..71663627f0 100644
--- a/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
+++ b/libsession/src/main/java/org/session/libsession/messaging/messages/control/ClosedGroupControlMessage.kt
@@ -7,6 +7,12 @@ import org.session.libsignal.crypto.ecc.DjbECPublicKey
 import org.session.libsignal.crypto.ecc.ECKeyPair
 import org.session.libsignal.protos.SignalServiceProtos
 import org.session.libsignal.protos.SignalServiceProtos.DataMessage
+import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR
+import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.MEMBERS_ADDED
+import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.MEMBERS_REMOVED
+import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT
+import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NAME_CHANGE
+import org.session.libsignal.protos.SignalServiceProtos.DataMessage.ClosedGroupControlMessage.Type.NEW
 import org.session.libsignal.utilities.Hex
 import org.session.libsignal.utilities.Log
 import org.session.libsignal.utilities.removingIdPrefixIfNeeded
@@ -78,46 +84,25 @@ class ClosedGroupControlMessage() : ControlMessage() {
     companion object {
         const val TAG = "ClosedGroupControlMessage"
 
-        fun fromProto(proto: SignalServiceProtos.Content): ClosedGroupControlMessage? {
-            if (!proto.hasDataMessage() || !proto.dataMessage.hasClosedGroupControlMessage()) return null
-            val closedGroupControlMessageProto = proto.dataMessage!!.closedGroupControlMessage!!
-            val kind: Kind
-            when (closedGroupControlMessageProto.type!!) {
-                DataMessage.ClosedGroupControlMessage.Type.NEW -> {
-                    val publicKey = closedGroupControlMessageProto.publicKey ?: return null
-                    val name = closedGroupControlMessageProto.name ?: return null
-                    val encryptionKeyPairAsProto = closedGroupControlMessageProto.encryptionKeyPair ?: return null
-                    val expirationTimer = closedGroupControlMessageProto.expirationTimer
-                    try {
-                        val encryptionKeyPair = ECKeyPair(DjbECPublicKey(encryptionKeyPairAsProto.publicKey.toByteArray()),
-                            DjbECPrivateKey(encryptionKeyPairAsProto.privateKey.toByteArray()))
-                        kind = Kind.New(publicKey, name, encryptionKeyPair, closedGroupControlMessageProto.membersList, closedGroupControlMessageProto.adminsList, expirationTimer)
-                    } catch (e: Exception) {
-                        Log.w(TAG, "Couldn't parse key pair from proto: $encryptionKeyPairAsProto.")
-                        return null
-                    }
-                }
-                DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR -> {
-                    val publicKey = closedGroupControlMessageProto.publicKey
-                    val wrappers = closedGroupControlMessageProto.wrappersList.mapNotNull { KeyPairWrapper.fromProto(it) }
-                    kind = Kind.EncryptionKeyPair(publicKey, wrappers)
-                }
-                DataMessage.ClosedGroupControlMessage.Type.NAME_CHANGE -> {
-                    val name = closedGroupControlMessageProto.name ?: return null
-                    kind = Kind.NameChange(name)
-                }
-                DataMessage.ClosedGroupControlMessage.Type.MEMBERS_ADDED -> {
-                    kind = Kind.MembersAdded(closedGroupControlMessageProto.membersList)
-                }
-                DataMessage.ClosedGroupControlMessage.Type.MEMBERS_REMOVED -> {
-                    kind = Kind.MembersRemoved(closedGroupControlMessageProto.membersList)
-                }
-                DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT -> {
-                    kind = Kind.MemberLeft()
-                }
-            }
-            return ClosedGroupControlMessage(kind)
-        }
+        fun fromProto(proto: SignalServiceProtos.Content): ClosedGroupControlMessage? =
+            proto.takeIf { it.hasDataMessage() }?.dataMessage
+                ?.takeIf { it.hasClosedGroupControlMessage() }?.closedGroupControlMessage
+                ?.run {
+                    when (type) {
+                        NEW -> takeIf { it.hasPublicKey() && it.hasEncryptionKeyPair() && it.hasName() }?.let {
+                            ECKeyPair(
+                                DjbECPublicKey(publicKey.toByteArray()),
+                                DjbECPrivateKey(encryptionKeyPair.privateKey.toByteArray())
+                            ).let { Kind.New(publicKey, name, it, membersList, adminsList, expirationTimer) }
+                        }
+                        ENCRYPTION_KEY_PAIR -> Kind.EncryptionKeyPair(publicKey, wrappersList.mapNotNull(KeyPairWrapper::fromProto))
+                        NAME_CHANGE -> takeIf { it.hasName() }?.let { Kind.NameChange(name) }
+                        MEMBERS_ADDED -> Kind.MembersAdded(membersList)
+                        MEMBERS_REMOVED -> Kind.MembersRemoved(membersList)
+                        MEMBER_LEFT -> Kind.MemberLeft()
+                        else -> null
+                    }?.let(::ClosedGroupControlMessage)
+             }
     }
 
     internal constructor(kind: Kind?, groupID: String? = null) : this() {
@@ -135,7 +120,7 @@ class ClosedGroupControlMessage() : ControlMessage() {
             val closedGroupControlMessage: DataMessage.ClosedGroupControlMessage.Builder = DataMessage.ClosedGroupControlMessage.newBuilder()
             when (kind) {
                 is Kind.New -> {
-                    closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.NEW
+                    closedGroupControlMessage.type = NEW
                     closedGroupControlMessage.publicKey = kind.publicKey
                     closedGroupControlMessage.name = kind.name
                     closedGroupControlMessage.encryptionKeyPair = SignalServiceProtos.KeyPair.newBuilder().also {
@@ -147,24 +132,24 @@ class ClosedGroupControlMessage() : ControlMessage() {
                     closedGroupControlMessage.expirationTimer = kind.expirationTimer
                 }
                 is Kind.EncryptionKeyPair -> {
-                    closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.ENCRYPTION_KEY_PAIR
+                    closedGroupControlMessage.type = ENCRYPTION_KEY_PAIR
                     closedGroupControlMessage.publicKey = kind.publicKey ?: ByteString.EMPTY
                     closedGroupControlMessage.addAllWrappers(kind.wrappers.map { it.toProto() })
                 }
                 is Kind.NameChange -> {
-                    closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.NAME_CHANGE
+                    closedGroupControlMessage.type = NAME_CHANGE
                     closedGroupControlMessage.name = kind.name
                 }
                 is Kind.MembersAdded -> {
-                    closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.MEMBERS_ADDED
+                    closedGroupControlMessage.type = MEMBERS_ADDED
                     closedGroupControlMessage.addAllMembers(kind.members)
                 }
                 is Kind.MembersRemoved -> {
-                    closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.MEMBERS_REMOVED
+                    closedGroupControlMessage.type = MEMBERS_REMOVED
                     closedGroupControlMessage.addAllMembers(kind.members)
                 }
                 is Kind.MemberLeft -> {
-                    closedGroupControlMessage.type = DataMessage.ClosedGroupControlMessage.Type.MEMBER_LEFT
+                    closedGroupControlMessage.type = MEMBER_LEFT
                 }
             }
             return SignalServiceProtos.Content.newBuilder().apply {