diff --git a/src/flux/tasks/change-mail-task.coffee b/src/flux/tasks/change-mail-task.coffee
index 89e9fdf33..bd1174b03 100644
--- a/src/flux/tasks/change-mail-task.coffee
+++ b/src/flux/tasks/change-mail-task.coffee
@@ -198,11 +198,9 @@ class ChangeMailTask extends Task
 
   createUndoTask: ->
     if @_isUndoTask
-      err = new Error("ChangeMailTask::createUndoTask Cannot create an undo task from an undo task.")
-      return Promise.resolve([Task.Status.Failed, err])
+      throw new Error("ChangeMailTask::createUndoTask Cannot create an undo task from an undo task.")
     if not @_restoreValues
-      err = new Error("ChangeMailTask::createUndoTask Cannot undo a task which has not finished performLocal yet.")
-      return Promise.resolve([Task.Status.Failed, err])
+      throw new Error("ChangeMailTask::createUndoTask Cannot undo a task which has not finished performLocal yet.")
 
     task = @createIdenticalTask()
     task._restoreValues = @_restoreValues