1 files changed, 2 insertions, 1 deletions
diff --git a/web-ui/app/js/mail_view/data/mail_sender.js b/web-ui/app/js/mail_view/data/mail_sender.js
index f769c262..a5a28209 100644
--- a/web-ui/app/js/mail_view/data/mail_sender.js
+++ b/web-ui/app/js/mail_view/data/mail_sender.js
@@ -48,11 +48,12 @@ define(
             contextMessage = context + ': ';
           }
 
-          if (xhr.responseJSON.message) {
+          if (xhr && xhr.responseJSON && xhr.responseJSON.message) {
             on.trigger(document, events.ui.userAlerts.displayMessage, {message: contextMessage + xhr.responseJSON.message});
           } else {
             on.trigger(document, events.ui.userAlerts.displayMessage, {message: 'Ops! something went wrong, try again later.'});
           }
+          on.trigger(document, events.mail.send_failed, {xhr: xhr, error:error});
         };
       }