diff --git a/about/build.gradle b/about/build.gradle
index 8d53ee188..6d7f2d320 100644
--- a/about/build.gradle
+++ b/about/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/app/build.gradle b/app/build.gradle
index eb5467f42..51fb855a6 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,8 +14,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
         minSdkVersion 21
         targetSdkVersion 30
         multiDexEnabled true
diff --git a/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt b/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
index d82717e83..e34cd87a6 100644
--- a/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
+++ b/app/src/main/java/dev/lucasnlm/antimine/splash/SplashActivity.kt
@@ -68,10 +68,14 @@ class SplashActivity : AppCompatActivity() {
     private fun migrateDateAndGoToGameActivity() {
         lifecycleScope.launchWhenCreated {
             if (!isFinishing) {
-                withContext(Dispatchers.IO) {
-                    playGamesManager.playerId()?.let {
-                        splashViewMode.migrateCloudSave(it)
+                try {
+                    withContext(Dispatchers.IO) {
+                        playGamesManager.playerId()?.let {
+                            splashViewMode.migrateCloudSave(it)
+                        }
                     }
+                } catch (e: Exception) {
+                    Log.e(TAG, "Play Games login was canceled", e)
                 }
 
                 goToGameActivity()
diff --git a/common/build.gradle b/common/build.gradle
index 24eb3e4dd..1969ee1ff 100644
--- a/common/build.gradle
+++ b/common/build.gradle
@@ -10,8 +10,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
         minSdkVersion 21
         targetSdkVersion 30
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
diff --git a/control/build.gradle b/control/build.gradle
index 59ae78ea8..22d2c68d8 100644
--- a/control/build.gradle
+++ b/control/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/core/build.gradle b/core/build.gradle
index 257bd4073..509e4897b 100644
--- a/core/build.gradle
+++ b/core/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/external/build.gradle b/external/build.gradle
index 3c7e6792b..ad0680c09 100644
--- a/external/build.gradle
+++ b/external/build.gradle
@@ -9,7 +9,7 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
+        versionCode 807021
         versionName '1.0'
     }
 
diff --git a/foss/build.gradle b/foss/build.gradle
index a988381af..764efdd48 100644
--- a/foss/build.gradle
+++ b/foss/build.gradle
@@ -8,8 +8,8 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
         minSdkVersion 21
         targetSdkVersion 30
     }
diff --git a/i18n/build.gradle b/i18n/build.gradle
index 7a1973c09..00731645f 100644
--- a/i18n/build.gradle
+++ b/i18n/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/preferences/build.gradle b/preferences/build.gradle
index 0b394bd52..eee1569ca 100644
--- a/preferences/build.gradle
+++ b/preferences/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/proprietary/build.gradle b/proprietary/build.gradle
index 93d1d3f8a..b9078898f 100644
--- a/proprietary/build.gradle
+++ b/proprietary/build.gradle
@@ -12,8 +12,8 @@ android {
     compileSdkVersion 30
 
     defaultConfig {
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
         minSdkVersion 21
         targetSdkVersion 30
     }
diff --git a/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt b/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
index 9af4e3906..bbf084e3e 100644
--- a/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
+++ b/proprietary/src/main/java/dev/lucasnlm/external/FeatureFlagManager.kt
@@ -1,5 +1,6 @@
 package dev.lucasnlm.external
 
+import android.util.Log
 import com.google.android.gms.tasks.Tasks
 import com.google.firebase.remoteconfig.FirebaseRemoteConfig
 import kotlinx.coroutines.Dispatchers
@@ -66,12 +67,18 @@ class FeatureFlagManager : IFeatureFlagManager() {
     override suspend fun refresh() {
         if (!BuildConfig.DEBUG) {
             withContext(Dispatchers.IO) {
-                Tasks.await(remoteConfig.fetchAndActivate())
+                try {
+                    Tasks.await(remoteConfig.fetchAndActivate())
+                } catch (e: Exception) {
+                    Log.e(TAG, "Fail to fetch flags", e)
+                }
             }
         }
     }
 
     companion object {
+        private val TAG = FeatureFlagManager::class.simpleName
+
         private const val HISTORY_ENABLED = "history_enabled"
         private const val RATE_US_ENABLED = "rate_us_enabled"
         private const val IN_APP_ADS_ENABLED = "in_app_ads_enabled"
diff --git a/purchases/build.gradle b/purchases/build.gradle
index ac2c413ed..1e60f9589 100644
--- a/purchases/build.gradle
+++ b/purchases/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/themes/build.gradle b/themes/build.gradle
index a3fefc5a5..42ad65057 100644
--- a/themes/build.gradle
+++ b/themes/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/ui/build.gradle b/ui/build.gradle
index 087983429..47f149fd1 100644
--- a/ui/build.gradle
+++ b/ui/build.gradle
@@ -9,8 +9,8 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 30
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         consumerProguardFiles "consumer-rules.pro"
diff --git a/wear/build.gradle b/wear/build.gradle
index 08f4b94cc..ad367c700 100644
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -10,8 +10,8 @@ android {
 
     defaultConfig {
         // versionCode and versionName must be hardcoded to support F-droid
-        versionCode 807011
-        versionName '8.7.1'
+        versionCode 807021
+        versionName '8.7.2'
         applicationId 'dev.lucasnlm.antimine'
         minSdkVersion 23
         targetSdkVersion 30