Split onError() into two methods.

4 jobs for !1655 with 2292-mailbox-file-manager in 8 minutes and 56 seconds (queued for 1 second)
latest merge request