diff --git a/SignalServiceKit/src/Messages/OWSMessageSender.m b/SignalServiceKit/src/Messages/OWSMessageSender.m
index 1adf7b43d..f055bf0ae 100644
--- a/SignalServiceKit/src/Messages/OWSMessageSender.m
+++ b/SignalServiceKit/src/Messages/OWSMessageSender.m
@@ -1978,6 +1978,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
         }
     }
 
+    /*
     if (message.linkPreview.imageAttachmentId != nil) {
         TSAttachment *attachment =
             [TSAttachment fetchObjectWithUniqueID:message.linkPreview.imageAttachmentId transaction:transaction];
@@ -1987,6 +1988,7 @@ NSString *const OWSMessageSenderRateLimitedException = @"RateLimitedException";
             OWSFailDebug(@"unexpected attachment: %@", attachment);
         }
     }
+     */
 
     // All outgoing messages should be saved at the time they are enqueued.
     [message saveWithTransaction:transaction];
diff --git a/SignalServiceKit/src/Util/OWSOperation.m b/SignalServiceKit/src/Util/OWSOperation.m
index 61cf16b1e..444d9c886 100644
--- a/SignalServiceKit/src/Util/OWSOperation.m
+++ b/SignalServiceKit/src/Util/OWSOperation.m
@@ -68,7 +68,7 @@ NSString *const OWSOperationKeyIsFinished = @"isFinished";
         // Don't proceed if dependency failed - surface the dependency's error.
         NSError *_Nullable dependencyError = dependentOperation.failingError;
         if (dependencyError != nil) {
-//            return dependencyError;
+            return dependencyError;
         }
     }