diff --git a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m
index 0055170ae..7e3ebbb02 100644
--- a/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m
+++ b/Signal/src/Models/TSMessageAdapaters/TSPhotoAdapter.m
@@ -105,6 +105,7 @@
 {
     NSString *actionString = NSStringFromSelector(action);
     if (!self.image) {
+        OWSAssert(NO);
         DDLogWarn(@"Refusing to perform '%@' action with nil image for %@: attachmentId=%@. (corrupted attachment?)",
             actionString,
             self.class,
diff --git a/Signal/test/view controllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m b/Signal/test/view controllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m
index 5326dabd1..e98a37e74 100644
--- a/Signal/test/view controllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m	
+++ b/Signal/test/view controllers/Signals/TSMessageAdapters/TSMessageAdapterTest.m	
@@ -19,6 +19,7 @@
 @property TSMessageAdapter *messageAdapter;
 @property TSOutgoingMessage *message;
 @property (readonly) NSData *fakeAudioData;
+@property (readonly) NSData *fakeImageData;
 
 @end
 
@@ -36,6 +37,12 @@
     return [[NSData alloc] initWithBase64EncodedString:fakeVideoString options:0];
 }
 
+- (NSData *)fakeImageData
+{
+    NSString *fakeString = @"RmFrZUltYWdlRGF0YQ==";
+    return [[NSData alloc] initWithBase64EncodedString:fakeString options:0];
+}
+
 - (void)setUp
 {
     [super setUp];
@@ -181,11 +188,12 @@
     [self.message.attachmentIds addObject:audioAttachment.uniqueId];
     [self.message save];
 
-    self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:audioAttachment incoming:NO];
-
     // Sanity Check
+    XCTAssertNil(error);
     XCTAssert([[NSFileManager defaultManager] fileExistsAtPath:audioAttachment.filePath]);
 
+    self.messageAdapter.mediaItem = [[TSVideoAttachmentAdapter alloc] initWithAttachment:audioAttachment incoming:NO];
+
     [self.messageAdapter performEditingAction:@selector(delete:)];
     XCTAssertNil([TSMessage fetchObjectWithUniqueID:self.message.uniqueId]);
     XCTAssertFalse([[NSFileManager defaultManager] fileExistsAtPath:audioAttachment.filePath]);
@@ -206,13 +214,27 @@
     UIPasteboard.generalPasteboard.items = @[];
     XCTAssertNil(UIPasteboard.generalPasteboard.image);
 
-    // Grab some random existing image
-    UIImage *image = [UIImage imageNamed:@"savephoto"];
-    TSPhotoAdapter *photoAdapter = [[TSPhotoAdapter alloc] initWithImage:image];
+    NSError *error;
+    TSAttachmentStream *attachment = [[TSAttachmentStream alloc] initWithContentType:@"image/jpeg"];
+    [attachment writeData:self.fakeAudioData error:&error];
+    [attachment save];
+
+    // Sanity Check
+    XCTAssertNil(error);
+    XCTAssert([[NSFileManager defaultManager] fileExistsAtPath:attachment.filePath]);
+
+    [self.message.attachmentIds addObject:attachment.uniqueId];
+    [self.message save];
+
+    TSPhotoAdapter *photoAdapter = [[TSPhotoAdapter alloc] initWithAttachment:attachment incoming:NO];
+    // assign random image, since photoAdapter expects an image.
+    photoAdapter.image = [UIImage imageNamed:@"savephoto"];
     self.messageAdapter.mediaItem = photoAdapter;
+
     [self.messageAdapter performEditingAction:@selector(copy:)];
 
-    XCTAssertNotNil(UIPasteboard.generalPasteboard.image);
+    NSData *copiedData = [UIPasteboard.generalPasteboard dataForPasteboardType:(NSString *)kUTTypeJPEG];
+    XCTAssertEqualObjects(self.fakeAudioData, copiedData);
 }
 
 - (void)testPerformCopyEditingActionWithVideoMessage