diff --git a/MyTracks/src/com/google/android/apps/mytracks/MapFragment.java b/MyTracks/src/com/google/android/apps/mytracks/MapFragment.java
index f35a20e12..f8e5abf77 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/MapFragment.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/MapFragment.java
@@ -414,8 +414,10 @@ public class MapFragment extends Fragment
    * Updates the trackDataHub. Needs to be synchronized because trackDataHub can be
    * accessed by multiple threads. 
    */
-  private synchronized void updateTrackDataHub() { 
-    trackDataHub.forceUpdateLocation();
+  private synchronized void updateTrackDataHub() {
+    if (trackDataHub != null) {
+      trackDataHub.forceUpdateLocation();
+    }
   }
   
   /**