diff --git a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
index 0f7d81ac3..b8b54beba 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/ChartActivity.java
@@ -338,7 +338,6 @@ public class ChartActivity extends Activity implements TrackDataListener {
 
   @Override
   public void onSelectedTrackChanged(Track track, boolean isRecording) {
-    Log.e(TAG, "Visible", new Throwable());
     runOnUiThread(new Runnable() {
       @Override
       public void run() {
@@ -349,6 +348,10 @@ public class ChartActivity extends Activity implements TrackDataListener {
 
   @Override
   public void onTrackUpdated(Track track) {
+    if (track == null || track.getStatistics() == null) {
+      trackMaxSpeed = 0.0;
+    }
+
     trackMaxSpeed = track.getStatistics().getMaxSpeed();
   }
 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
index 73e4cd6f9..0656fa6a4 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/StatsActivity.java
@@ -250,15 +250,6 @@ public class StatsActivity extends Activity implements TrackDataListener {
       thread.interrupt();
       thread = null;
     }
-
-    if (track == null || track.getStatistics() == null) {
-      runOnUiThread(new Runnable() {
-        @Override
-        public void run() {
-          utils.setAllToUnknown();
-        }
-      });
-    }
   }
 
   @Override
@@ -288,6 +279,11 @@ public class StatsActivity extends Activity implements TrackDataListener {
     runOnUiThread(new Runnable() {
       @Override
       public void run() {
+        if (track == null || track.getStatistics() == null) {
+          utils.setAllToUnknown();
+          return;
+        }
+
         startTime = track.getStatistics().getStartTime();
         if (!dataHub.isRecordingSelected()) {
           utils.setTime(R.id.total_time_register,