diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/TestsListPreloaderThread.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/TestsListPreloaderThread.java
index f76105d0fc56f..2145af77b230c 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/TestsListPreloaderThread.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/TestsListPreloaderThread.java
@@ -68,15 +68,15 @@ public class TestsListPreloaderThread extends Thread {
         File file = new File(TESTS_ROOT_DIR_PATH, mRelativePath);
         if (!file.exists()) {
             Log.e(LOG_TAG + "::run", "Path does not exist: " + mRelativePath);
-            return;
+        } else {
+            /** Populate the tests' list accordingly */
+            if (file.isDirectory()) {
+                preloadTests(mRelativePath);
+            } else {
+                mTestsList.add(mRelativePath);
+            }
         }
 
-        /** Populate the tests' list accordingly */
-        if (file.isDirectory()) {
-            preloadTests(mRelativePath);
-        } else {
-            mTestsList.add(mRelativePath);
-        }
         mDoneMsg.obj = mTestsList;
         mDoneMsg.sendToTarget();
     }
diff --git a/tests/DumpRenderTree2/src/com/android/dumprendertree2/ui/DirListActivity.java b/tests/DumpRenderTree2/src/com/android/dumprendertree2/ui/DirListActivity.java
index 661a8ec02fb98..af0d7d166cbc7 100644
--- a/tests/DumpRenderTree2/src/com/android/dumprendertree2/ui/DirListActivity.java
+++ b/tests/DumpRenderTree2/src/com/android/dumprendertree2/ui/DirListActivity.java
@@ -378,6 +378,10 @@ public class DirListActivity extends ListActivity {
     private ListItem[] getDirList(String dirPath) {
         File dir = new File(mRootDirPath, dirPath);
 
+        if (!dir.exists()) {
+            return new ListItem[0];
+        }
+
         List<ListItem> subDirs = new ArrayList<ListItem>();
         List<ListItem> subFiles = new ArrayList<ListItem>();