diff --git a/Session/Meta/AppDelegate.swift b/Session/Meta/AppDelegate.swift
index f89c59bec..cf651fb1e 100644
--- a/Session/Meta/AppDelegate.swift
+++ b/Session/Meta/AppDelegate.swift
@@ -454,7 +454,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, UNUserNotificationCenterD
                         
                         return try Interaction
                             .filter(Interaction.Columns.wasRead == false)
-                            .filter(Interaction.Variant.variantsToIncrementUnreadCount.contains(Interaction.Column.variant))
+                            .filter(Interaction.Variant.variantsToIncrementUnreadCount.contains(Interaction.Columns.variant))
                             .filter(
                                 // Only count mentions if 'onlyNotifyForMentions' is set
                                 thread[.onlyNotifyForMentions] == false ||
diff --git a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift
index 31977f92b..4dc079f15 100644
--- a/SessionMessagingKit/Messages/Control Messages/CallMessage.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/CallMessage.swift	
@@ -200,12 +200,7 @@ public final class CallMessage: ControlMessage {
         }
         
         // DisappearingMessagesConfiguration
-        do {
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
-        } catch {
-            SNLog("Couldn't construct call message proto from: \(self).")
-            return nil
-        }
+        setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
     }
     
     // MARK: - Description
diff --git a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift
index c22b19d88..39a2548d3 100644
--- a/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/ClosedGroupControlMessage.swift	
@@ -340,7 +340,7 @@ public final class ClosedGroupControlMessage: ControlMessage {
             let dataMessageProto = SNProtoDataMessage.builder()
             dataMessageProto.setClosedGroupControlMessage(try closedGroupControlMessage.build())
             // DisappearingMessagesConfiguration
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
+            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
             // Group context
             try setGroupContextIfNeeded(db, on: dataMessageProto)
             contentProto.setDataMessage(try dataMessageProto.build())
diff --git a/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift b/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift
index 993db3966..6fdd71176 100644
--- a/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/DataExtractionNotification.swift	
@@ -93,7 +93,7 @@ public final class DataExtractionNotification: ControlMessage {
             let contentProto = SNProtoContent.builder()
             contentProto.setDataExtractionNotification(try dataExtractionNotification.build())
             // DisappearingMessagesConfiguration
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
+            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct data extraction notification proto from: \(self).")
diff --git a/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift b/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift
index c8a8b0d35..8e8dd3d18 100644
--- a/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/ExpirationTimerUpdate.swift	
@@ -83,12 +83,7 @@ public final class ExpirationTimerUpdate: ControlMessage {
         let contentProto = SNProtoContent.builder()
         
         // DisappearingMessagesConfiguration
-        do {
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
-        } catch {
-            SNLog("Couldn't construct visible message proto from: \(self).")
-            return nil
-        }
+        setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
         
         do {
             contentProto.setDataMessage(try dataMessageProto.build())
diff --git a/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift b/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift
index ca925ef8a..050a39368 100644
--- a/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/MessageRequestResponse.swift	
@@ -75,7 +75,7 @@ public final class MessageRequestResponse: ControlMessage {
         do {
             contentProto.setMessageRequestResponse(try messageRequestResponseProto.build())
             // DisappearingMessagesConfiguration
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
+            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct unsend request proto from: \(self).")
diff --git a/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift b/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift
index 0e8ab117f..619879f01 100644
--- a/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/ReadReceipt.swift	
@@ -65,7 +65,7 @@ public final class ReadReceipt: ControlMessage {
         do {
             contentProto.setReceiptMessage(try receiptProto.build())
             // DisappearingMessagesConfiguration
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
+            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct read receipt proto from: \(self).")
diff --git a/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift b/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift
index 9d34dd18e..87a9f03f2 100644
--- a/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/TypingIndicator.swift	
@@ -91,7 +91,7 @@ public final class TypingIndicator: ControlMessage {
         do {
             contentProto.setTypingMessage(try typingIndicatorProto.build())
             // DisappearingMessagesConfiguration
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
+            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct typing indicator proto from: \(self).")
diff --git a/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift b/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift
index 6d4faa2aa..d8e0417de 100644
--- a/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift	
+++ b/SessionMessagingKit/Messages/Control Messages/UnsendRequest.swift	
@@ -71,7 +71,7 @@ public final class UnsendRequest: ControlMessage {
         do {
             contentProto.setUnsendRequest(try unsendRequestProto.build())
             // DisappearingMessagesConfiguration
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
+            setDisappearingMessagesConfigurationIfNeeded(db, on: contentProto)
             return try contentProto.build()
         } catch {
             SNLog("Couldn't construct unsend request proto from: \(self).")
diff --git a/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift b/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift
index 4ceed772f..757aab27b 100644
--- a/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift	
+++ b/SessionMessagingKit/Messages/Visible Messages/VisibleMessage.swift	
@@ -182,12 +182,7 @@ public final class VisibleMessage: Message {
         }
         
         // DisappearingMessagesConfiguration
-        do {
-            try setDisappearingMessagesConfigurationIfNeeded(db, on: proto)
-        } catch {
-            SNLog("Couldn't construct visible message proto from: \(self).")
-            return nil
-        }
+        setDisappearingMessagesConfigurationIfNeeded(db, on: proto)
         
         // Group context
         do {