Nalexander/bug 958893 fxa client errors