diff --git a/ts/models/conversations.ts b/ts/models/conversations.ts
index e71ec491ba..3a3a28ab2b 100644
--- a/ts/models/conversations.ts
+++ b/ts/models/conversations.ts
@@ -3259,7 +3259,7 @@ export class ConversationModel extends window.Backbone
         'Error sending deleteForEveryone',
         deleteModel,
         targetTimestamp,
-        error
+        error && error.stack
       );
 
       throw error;
diff --git a/ts/models/messages.ts b/ts/models/messages.ts
index 2dabd4f6fc..e22d911c70 100644
--- a/ts/models/messages.ts
+++ b/ts/models/messages.ts
@@ -1430,6 +1430,11 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
   }
 
   public hasSuccessfulDelivery(): boolean {
+    const recipients = this.get('recipients') || [];
+    if (recipients.length === 0) {
+      return true;
+    }
+
     return (this.get('sent_to') || []).length !== 0;
   }
 
diff --git a/ts/views/conversation_view.ts b/ts/views/conversation_view.ts
index 68ff2158f1..5ad0e4c08b 100644
--- a/ts/views/conversation_view.ts
+++ b/ts/views/conversation_view.ts
@@ -2937,7 +2937,7 @@ Whisper.ConversationView = Whisper.View.extend({
         } catch (error) {
           window.log.error(
             'Error sending delete-for-everyone',
-            error,
+            error && error.stack,
             messageId
           );
           this.showToast(Whisper.DeleteForEveryoneFailedToast);