Add additional try catch.
Move to OAuth.io authentication provider
Slightly refactoring.