diff --git a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
index 1349adc53..8ac6e915d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/content/TrackDataHub.java
@@ -313,7 +313,8 @@ public class TrackDataHub {
 
   @Override
   protected void finalize() throws Throwable {
-    if (isStarted() || listenerHandlerThread.isAlive()) {
+    if (isStarted() ||
+        (listenerHandlerThread != null && listenerHandlerThread.isAlive())) {
       Log.e(TAG, "Forgot to stop() TrackDataHub");
     }