diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
index 74e485eb68..3666cd2f38 100644
--- a/js/views/conversation_view.js
+++ b/js/views/conversation_view.js
@@ -1804,7 +1804,10 @@
             saveAttachmentToDisk,
             timestamp,
           });
-          this.showToast(Whisper.FileSavedToast, { fullPath });
+
+          if (fullPath) {
+            this.showToast(Whisper.FileSavedToast, { fullPath });
+          }
         };
 
         const onItemClick = async ({ message, attachment, type }) => {
@@ -2001,7 +2004,10 @@
         saveAttachmentToDisk,
         timestamp,
       });
-      this.showToast(Whisper.FileSavedToast, { fullPath });
+
+      if (fullPath) {
+        this.showToast(Whisper.FileSavedToast, { fullPath });
+      }
     },
 
     async displayTapToViewMessage(messageId) {
@@ -2205,7 +2211,10 @@
           saveAttachmentToDisk,
           timestamp: options.message.get('sent_at'),
         });
-        this.showToast(Whisper.FileSavedToast, { fullPath });
+
+        if (fullPath) {
+          this.showToast(Whisper.FileSavedToast, { fullPath });
+        }
       };
 
       const props = {
diff --git a/ts/components/conversation/Quote.tsx b/ts/components/conversation/Quote.tsx
index 0f1ea3815f..0485f1a1b2 100644
--- a/ts/components/conversation/Quote.tsx
+++ b/ts/components/conversation/Quote.tsx
@@ -105,6 +105,15 @@ export class Quote extends React.Component<Props, State> {
       onClick();
     }
   };
+  public handleClick = (event: React.MouseEvent<HTMLButtonElement>) => {
+    const { onClick } = this.props;
+
+    if (onClick) {
+      event.preventDefault();
+      event.stopPropagation();
+      onClick();
+    }
+  };
 
   public handleImageError = () => {
     // tslint:disable-next-line no-console
@@ -381,7 +390,7 @@ export class Quote extends React.Component<Props, State> {
         )}
       >
         <button
-          onClick={onClick}
+          onClick={this.handleClick}
           onKeyDown={this.handleKeyDown}
           className={classNames(
             'module-quote',
diff --git a/ts/types/Attachment.ts b/ts/types/Attachment.ts
index 0d3e532af8..9ffe8d6087 100644
--- a/ts/types/Attachment.ts
+++ b/ts/types/Attachment.ts
@@ -339,7 +339,7 @@ export const save = async ({
     name: string;
   }) => Promise<{ name: string; fullPath: string }>;
   timestamp?: number;
-}): Promise<string> => {
+}): Promise<string | null> => {
   if (!attachment.path && !attachment.data) {
     throw new Error('Attachment had neither path nor data');
   }
@@ -349,12 +349,16 @@ export const save = async ({
     : attachment.data;
   const name = getSuggestedFilename({ attachment, timestamp, index });
 
-  const { fullPath } = await saveAttachmentToDisk({
+  const result = await saveAttachmentToDisk({
     data,
     name,
   });
 
-  return fullPath;
+  if (!result) {
+    return null;
+  }
+
+  return result.fullPath;
 };
 
 export const getSuggestedFilename = ({