@abarisain Could you review this. This is related to Crashlytics #209. I think this will fix it, but I'm not really sure how it could happen in the first place.