Improved error handling for the Facebook / Twitter widgets
Merging