diff --git a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt
index 935c677e2..08396be2e 100644
--- a/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt
+++ b/app/src/main/kotlin/info/appdev/chartexample/PieChartActivity.kt
@@ -167,16 +167,16 @@ class PieChartActivity : DemoBase(), OnSeekBarChangeListener, OnChartValueSelect
             }
 
             R.id.actionToggleValues -> {
-                binding.chart1.data!!.dataSets.forEach {
+                binding.chart1.data?.dataSets?.forEach {
                     it?.isDrawValues = !it.isDrawValues
                 }
                 binding.chart1.invalidate()
             }
 
             R.id.actionToggleIcons -> {
-                for (set in binding.chart1.data!!.getDataSets())
+                binding.chart1.data?.dataSets?.forEach { set ->
                     set?.isDrawIcons = !set.isDrawIcons
-
+                }
                 binding.chart1.invalidate()
             }