diff --git a/src/Contacts/ContactsUpdater.h b/src/Contacts/ContactsUpdater.h
index cc421f42c..7bfab04c2 100644
--- a/src/Contacts/ContactsUpdater.h
+++ b/src/Contacts/ContactsUpdater.h
@@ -10,8 +10,6 @@ NS_ASSUME_NONNULL_BEGIN
 
 @interface ContactsUpdater : NSObject
 
-#define NOTFOUND_ERROR 777404
-
 + (instancetype)sharedUpdater;
 
 - (nullable SignalRecipient *)synchronousLookup:(NSString *)identifier error:(NSError **)error;
diff --git a/src/Contacts/ContactsUpdater.m b/src/Contacts/ContactsUpdater.m
index 84ff7a856..569fc3118 100644
--- a/src/Contacts/ContactsUpdater.m
+++ b/src/Contacts/ContactsUpdater.m
@@ -66,9 +66,7 @@ NS_ASSUME_NONNULL_BEGIN
                                  if (matchedIds.count == 1) {
                                      success([SignalRecipient recipientWithTextSecureIdentifier:identifier]);
                                  } else {
-                                     failure([NSError errorWithDomain:@"contactsmanager.notfound"
-                                                                 code:NOTFOUND_ERROR
-                                                             userInfo:nil]);
+                                     failure(OWSErrorMakeNoSuchSignalRecipientError());
                                  }
                              }
                              failure:failure];
diff --git a/src/Messages/OWSMessageSender.m b/src/Messages/OWSMessageSender.m
index d5c6af86e..e0c2043a7 100644
--- a/src/Messages/OWSMessageSender.m
+++ b/src/Messages/OWSMessageSender.m
@@ -286,13 +286,12 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
                 recipient = [self.contactsUpdater synchronousLookup:recipientContactId error:&error];
 
                 if (error) {
-                    if (error.code == NOTFOUND_ERROR) {
-                        DDLogWarn(@"recipient contact not found with error: %@", error);
+                    if (error.code == OWSErrorCodeNoSuchSignalRecipient) {
+                        DDLogWarn(@"%@ recipient contact not found", self.tag);
                         [self unregisteredRecipient:recipient message:message thread:thread];
-                        NSError *error = OWSErrorMakeNoSuchSignalRecipientError();
-                        return failureHandler(error);
                     }
-                    DDLogError(@"contact lookup failed with error: %@", error);
+
+                    DDLogError(@"%@ contact lookup failed with error: %@", self.tag, error);
                     return failureHandler(error);
                 }
             }
diff --git a/src/Util/OWSError.h b/src/Util/OWSError.h
index a61438fa5..c809828be 100644
--- a/src/Util/OWSError.h
+++ b/src/Util/OWSError.h
@@ -20,6 +20,7 @@ typedef NS_ENUM(NSInteger, OWSErrorCode) {
     OWSErrorCodeSignalServiceFailure = 1001,
     OWSErrorCodeSignalServiceRateLimited = 1010,
     OWSErrorCodeUserError = 2001,
+    OWSErrorCodeNoSuchSignalRecipient = 777404,
 };
 
 extern NSError *OWSErrorWithCodeDescription(OWSErrorCode code, NSString *description);