diff --git a/app/src/main/java/org/thoughtcrime/securesms/exporter/SignalSmsExportReader.kt b/app/src/main/java/org/thoughtcrime/securesms/exporter/SignalSmsExportReader.kt
index ce266109b..0b5d190a1 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/exporter/SignalSmsExportReader.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/exporter/SignalSmsExportReader.kt
@@ -180,9 +180,9 @@ class SignalSmsExportReader(
     }
 
     private fun readExportableSmsMessageFromRecord(record: MessageRecord, exportState: MessageExportState): ExportableMessage {
-      val threadRecipient = SignalDatabase.threads.getRecipientForThreadId(record.threadId)!!
+      val threadRecipient = SignalDatabase.threads.getRecipientForThreadId(record.threadId)
 
-      return if (threadRecipient.isMmsGroup) {
+      return if (threadRecipient?.isMmsGroup == true) {
         readExportableMmsMessageFromRecord(record, exportState)
       } else {
         ExportableMessage.Sms(