Work on error handling for both Google and Facebook client models