Handle case where Google Play Service not available + bug fix