diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt
index 5d0c1d6e36..20e40bc823 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/ChatFolderTables.kt
@@ -171,6 +171,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
    */
   fun getChatFolder(id: Long?): ChatFolderRecord? {
     if (id == null) {
+      Log.w(TAG, "Chat folder id was null")
       return null
     }
     val includedChats: Map<Long, List<Long>> = getIncludedChats(id)
@@ -495,7 +496,7 @@ class ChatFolderTables(context: Context?, databaseHelper: SignalDatabase?) : Dat
         val encodedKey = cursor.requireNonNullString(ChatFolderTable.STORAGE_SERVICE_ID)
         val key = Base64.decodeOrThrow(encodedKey)
         StorageId.forChatFolder(key)
-      }
+      }.also { Log.i(TAG, "${it.size} folders have storage ids.") }
   }
 
   /**
diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
index 6b1456107c..a7b70a8b55 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/StorageSyncJob.kt
@@ -529,7 +529,7 @@ class StorageSyncJob private constructor(parameters: Parameters, private var loc
           if (chatFolderRecord?.chatFolderId != null) {
             records.add(StorageSyncModels.localToRemoteRecord(chatFolderRecord, id.raw))
           } else {
-            throw MissingChatFolderModelError("Missing local chat folder model!")
+            throw MissingChatFolderModelError("Missing local chat folder model! Type: " + id.type)
           }
         }