From 2c973782c4f500bc0b180727a134cf3465e8a4d2 Mon Sep 17 00:00:00 2001
From: Matthew Chen <matthew@signal.org>
Date: Mon, 23 Jul 2018 16:52:00 -0400
Subject: [PATCH] Fix NPE using mock for unknown database objects.

---
 SignalServiceKit/src/Contacts/TSThread.m | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/SignalServiceKit/src/Contacts/TSThread.m b/SignalServiceKit/src/Contacts/TSThread.m
index e86820e67..d6bcdb087 100644
--- a/SignalServiceKit/src/Contacts/TSThread.m
+++ b/SignalServiceKit/src/Contacts/TSThread.m
@@ -99,7 +99,7 @@ NS_ASSUME_NONNULL_BEGIN
     OWSAssert(interactionsByThread);
     [interactionsByThread enumerateKeysInGroup:self.uniqueId
                                     usingBlock:^(NSString *collection, NSString *key, NSUInteger index, BOOL *stop) {
-                                        if (key.length < 1) {
+                                        if (![key isKindOfClass:[NSString class]] || key.length < 1) {
                                             OWSProdLogAndFail(@"%@ invalid key in thread interactions.", self.logTag);
                                             return;
                                         }