diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
index 138b63393..329a7ff3f 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/endtoendtest/EndToEndTestUtils.java
@@ -394,13 +394,12 @@ public class EndToEndTestUtils {
    */
   public static boolean isTrackListEmpty(boolean isClick) {
     int trackNumber = SOLO.getCurrentListViews().get(0).getCount();
-    if(trackNumber <= 0) {
+    if (trackNumber <= 0) {
       return true;
-    } 
-
-    View oneTrack = SOLO.getCurrentListViews().get(0).getChildAt(0);
-    trackName = (String) ((TextView) oneTrack.findViewById(R.id.list_item_name)).getText();
+    }
     if (isClick) {
+      View oneTrack = SOLO.getCurrentListViews().get(0).getChildAt(0);
+      trackName = (String) ((TextView) oneTrack.findViewById(R.id.list_item_name)).getText();
       SOLO.scrollUp();
       SOLO.clickOnView(oneTrack);
     }