diff --git a/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m b/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m
index 44703f7de..d60423603 100644
--- a/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m
+++ b/Signal/src/ViewControllers/ThreadSettings/OWSAddToContactViewController.m
@@ -198,7 +198,8 @@ NS_ASSUME_NONNULL_BEGIN
     }
     CNContact *_Nullable cnContact = [self.contactsManager cnContactWithId:contact.cnContactId];
     if (!cnContact) {
-        // TODO:
+        OWSFail(@"%@ Could not load system contact.", self.logTag);
+        return;
     }
     [self.contactsViewHelper presentContactViewControllerForRecipientId:self.recipientId
                                                      fromViewController:self