diff --git a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
index d25b5e4b2..6e0219f23 100644
--- a/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
+++ b/Signal/src/ViewControllers/ConversationView/Cells/OWSMessageBubbleView.m
@@ -848,6 +848,8 @@ NS_ASSUME_NONNULL_BEGIN
         stillImageView.image = [strongSelf
             tryToLoadCellMedia:^{
                 OWSCAssert([strongSelf.attachmentStream isImage]);
+                OWSCAssert([strongSelf.attachmentStream isValidImage]);
+
                 return [strongSelf.attachmentStream
                     thumbnailImageMediumWithSuccess:^(UIImage *image) {
                         weakImageView.image = image;
@@ -897,6 +899,7 @@ NS_ASSUME_NONNULL_BEGIN
         animatedImageView.image = [strongSelf
             tryToLoadCellMedia:^{
                 OWSCAssert([strongSelf.attachmentStream isAnimated]);
+                OWSCAssert([strongSelf.attachmentStream isValidImage]);
 
                 NSString *_Nullable filePath = [strongSelf.attachmentStream originalFilePath];
                 YYImage *_Nullable animatedImage = nil;
@@ -980,6 +983,8 @@ NS_ASSUME_NONNULL_BEGIN
         stillImageView.image = [strongSelf
             tryToLoadCellMedia:^{
                 OWSCAssert([strongSelf.attachmentStream isVideo]);
+                OWSCAssert([strongSelf.attachmentStream isValidVideo]);
+
                 return [strongSelf.attachmentStream
                     thumbnailImageMediumWithSuccess:^(UIImage *image) {
                         weakImageView.image = image;
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
index b71da965b..3378f63ba 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationViewController.m
@@ -2220,7 +2220,7 @@ typedef enum : NSUInteger {
 
     NSFileManager *fileManager = [NSFileManager defaultManager];
     if (![fileManager fileExistsAtPath:attachmentStream.originalFilePath]) {
-        OWSFail(@"%@ Missing video file: %@", self.logTag, attachmentStream.originalFilePath);
+        OWSFail(@"%@ Missing audio file: %@", self.logTag, attachmentStream.originalFilePath);
     }
 
     [self dismissKeyBoard];