diff --git a/js/models/messages.js b/js/models/messages.js
index 386dc1f98..c8558f3b2 100644
--- a/js/models/messages.js
+++ b/js/models/messages.js
@@ -510,22 +510,22 @@
 
                                         console.log('done with handleDataMessage', message.idForLogging());
 
-                                        if (confirm) {
-                                            confirm();
-                                        }
+                                        confirm();
                                         return resolve();
                                     }
                                     catch (e) {
                                         handleError(e);
                                     }
                                 }, function(error) {
-                                    console.log('handleDataMessage: Message', message.idForLogging(), 'was deleted');
+                                    try {
+                                        console.log('handleDataMessage: Message', message.idForLogging(), 'was deleted');
 
-                                    if (confirm) {
                                         confirm();
+                                        return resolve();
+                                    }
+                                    catch (e) {
+                                        handleError(e);
                                     }
-
-                                    return resolve();
                                 });
                             }, handleError);
                         }, handleError);