Fix OAuth error handling
Merge branch 'fix-oauth-error-handling'