Merge "Better error handling in UsageStats."