bug 859715 protect against migration failures of social providers, r=markh, a=gavin