diff --git a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
index b055d92501..ae10a7d061 100644
--- a/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
+++ b/app/src/main/java/info/nightscout/androidaps/plugins/general/overview/OverviewMenus.kt
@@ -15,10 +15,11 @@ import info.nightscout.androidaps.R
 import info.nightscout.androidaps.events.EventRefreshOverview
 import info.nightscout.androidaps.interfaces.Config
 import info.nightscout.androidaps.interfaces.Loop
-import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.androidaps.plugins.bus.RxBus
+import info.nightscout.androidaps.utils.FabricPrivacy
 import info.nightscout.androidaps.utils.buildHelper.BuildHelper
 import info.nightscout.androidaps.utils.resources.ResourceHelper
+import info.nightscout.shared.logging.AAPSLogger
 import info.nightscout.shared.sharedPreferences.SP
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -31,19 +32,21 @@ class OverviewMenus @Inject constructor(
     private val rxBus: RxBus,
     private val buildHelper: BuildHelper,
     private val loop: Loop,
-    private val config: Config
+    private val config: Config,
+    private val fabricPrivacy: FabricPrivacy
 ) {
+
     enum class CharType(@StringRes val nameId: Int, @AttrRes val attrId: Int, @AttrRes val attrTextId: Int, val primary: Boolean, val secondary: Boolean, @StringRes val shortnameId: Int) {
         PRE(R.string.overview_show_predictions, R.attr.predictionColor, R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.prediction_shortname),
-        TREAT(R.string.overview_show_treatments, R.attr.predictionColor,  R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.treatments_shortname),
-        BAS(R.string.overview_show_basals, R.attr.basal,  R.attr.menuTextColor, primary = true, secondary = false,shortnameId = R.string.basal_shortname),
-        ABS(R.string.overview_show_absinsulin, R.attr.iobColor,  R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.abs_insulin_shortname),
-        IOB(R.string.overview_show_iob, R.attr.iobColor,  R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.iob),
-        COB(R.string.overview_show_cob, R.attr.cobColor,  R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.cob),
-        DEV(R.string.overview_show_deviations, R.attr.bgiColor,  R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.deviation_shortname),
-        BGI(R.string.overview_show_bgi,  R.attr.bgiColor, R.attr.menuTextColor, primary = false, secondary = true,shortnameId = R.string.bgi_shortname),
-        SEN(R.string.overview_show_sensitivity, R.attr.ratioColor,  R.attr.menuTextColorInverse, primary = false, secondary = true,shortnameId = R.string.sensitivity_shortname),
-        ACT(R.string.overview_show_activity, R.attr.activityColor,  R.attr.menuTextColor, primary = true, secondary = false,shortnameId = R.string.activity_shortname),
+        TREAT(R.string.overview_show_treatments, R.attr.predictionColor, R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.treatments_shortname),
+        BAS(R.string.overview_show_basals, R.attr.basal, R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.basal_shortname),
+        ABS(R.string.overview_show_absinsulin, R.attr.iobColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.abs_insulin_shortname),
+        IOB(R.string.overview_show_iob, R.attr.iobColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.iob),
+        COB(R.string.overview_show_cob, R.attr.cobColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.cob),
+        DEV(R.string.overview_show_deviations, R.attr.bgiColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.deviation_shortname),
+        BGI(R.string.overview_show_bgi, R.attr.bgiColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.bgi_shortname),
+        SEN(R.string.overview_show_sensitivity, R.attr.ratioColor, R.attr.menuTextColorInverse, primary = false, secondary = true, shortnameId = R.string.sensitivity_shortname),
+        ACT(R.string.overview_show_activity, R.attr.activityColor, R.attr.menuTextColor, primary = true, secondary = false, shortnameId = R.string.activity_shortname),
         DEVSLOPE(R.string.overview_show_deviationslope, R.attr.devSlopePosColor, R.attr.menuTextColor, primary = false, secondary = true, shortnameId = R.string.devslope_shortname)
     }
 
@@ -138,21 +141,27 @@ class OverviewMenus @Inject constructor(
             }
 
             popup.setOnMenuItemClickListener {
-                // id < 100 graph header - divider 1, 2, 3 .....
-                when {
-                    it.itemId == numOfGraphs -> {
-                        // add new empty
-                        _setting.add(Array(CharType.values().size) { false })
-                    }
-                    it.itemId < 100          -> {
-                        // remove graph
-                        _setting.removeAt(it.itemId)
-                    }
-                    else                     -> {
-                        val graphNumber = it.itemId / 100 - 1
-                        val item = it.itemId % 100
-                        _setting[graphNumber][item] = !it.isChecked
+                try {
+                    // id < 100 graph header - divider 1, 2, 3 .....
+                    when {
+                        it.itemId == numOfGraphs -> {
+                            // add new empty
+                            _setting.add(Array(CharType.values().size) { false })
+                        }
+
+                        it.itemId < 100          -> {
+                            // remove graph
+                            _setting.removeAt(it.itemId)
+                        }
+
+                        else                     -> {
+                            val graphNumber = it.itemId / 100 - 1
+                            val item = it.itemId % 100
+                            _setting[graphNumber][item] = !it.isChecked
+                        }
                     }
+                } catch (exception: Exception) {
+                    fabricPrivacy.logException(exception)
                 }
                 storeGraphConfig()
                 setupChartMenu(context, chartButton)