diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartSettingsDialog.java b/MyTracks/src/com/google/android/apps/mytracks/ChartSettingsDialog.java
index b0aa5a14f..0610e0671 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartSettingsDialog.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartSettingsDialog.java
@@ -66,6 +66,10 @@ public class ChartSettingsDialog extends Dialog {
   }
 
   public void setup(ChartActivity chart) {
+    if (chart == null) {
+      return;
+    }
+
     RadioGroup rd = (RadioGroup) findViewById(R.id.chart_settings_x);
     rd.check(chart.getMode() == Mode.BY_DISTANCE
              ? R.id.chart_settings_by_distance