diff --git a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
index 70accd189..70d832f5b 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/TrackDetailActivity.java
@@ -183,9 +183,9 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
+    myTracksProviderUtils = MyTracksProviderUtils.Factory.get(this);
     handleIntent(getIntent());
 
-    myTracksProviderUtils = MyTracksProviderUtils.Factory.get(this);
     sharedPreferences = getSharedPreferences(Constants.SETTINGS_NAME, Context.MODE_PRIVATE);
 
     trackRecordingServiceConnection = new TrackRecordingServiceConnection(
@@ -486,26 +486,17 @@ public class TrackDetailActivity extends AbstractMyTracksActivity implements Del
     if (markerId != -1L) {
       Waypoint waypoint = myTracksProviderUtils.getWaypoint(markerId);
       if (waypoint == null) {
-        exit();
+        finish();        
         return;
       }
       trackId = waypoint.getTrackId();
     }
     if (trackId == -1L) {
-      exit();
+      finish();
       return;
     }
   }
 
-  /**
-   * Exists and returns to {@link TrackListActivity}.
-   */
-  private void exit() {
-    Intent newIntent = IntentUtils.newIntent(this, TrackListActivity.class);
-    startActivity(newIntent);
-    finish();
-  }
-
   /**
    * Shows marker.
    */