Add better handling for Twitter provider.