OAuth Code cleanup. And Handled the OAuthHandler null issue in

interceptor.