Fix regression in throwing proper 2FA exception

In 451eddc we were a little overzealous in removing async/await calls. Anywhere we do a try/catch around a
method that returns a Task, we need to use await.