diff --git a/.travis.yml b/.travis.yml
index eb23bf0..9c7a46e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,39 +1,18 @@
-language: java
-jdk: oraclejdk7
+language: android
 env:
-    matrix:
-    #- ANDROID_SDKS=android-8            ANDROID_TARGET=android-8   ANDROID_ABI=armeabi
-    #- ANDROID_SDKS=android-10           ANDROID_TARGET=android-10  ANDROID_ABI=armeabi
-    #- ANDROID_SDKS=sysimg-16            ANDROID_TARGET=android-16  ANDROID_ABI=armeabi-v7a
-    - ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19  ANDROID_ABI=armeabi-v7a
+  matrix:
+    - ANDROID_SDKS=android-19,sysimg-19 ANDROID_TARGET=android-19 ANDROID_ABI=armeabi-v7a
+android:
+  components:
+    - build-tools-19.1.0
+    - android-19
+    - sysimg-19
+    - extra-android-support
+  licenses:
+    - android-sdk-license-bcbbd656
+    - android-sdk-license-5be876d5
+    - '.*intel.+'
+    
 before_install:
-
-    # Install base Android SDK
-    - sudo apt-get update -qq
-    - if [ `uname -m` = x86_64 ]; then sudo apt-get install -qq --force-yes libgd2-xpm ia32-libs ia32-libs-multiarch; fi
-    - wget http://dl.google.com/android/android-sdk_r22.6.2-linux.tgz
-    - tar zxf android-sdk_r22.6.2-linux.tgz
-    - export ANDROID_HOME=`pwd`/android-sdk-linux
-    - export PATH=${PATH}:${ANDROID_HOME}/tools:${ANDROID_HOME}/platform-tools
-
-    - echo "sdk.dir=$ANDROID_HOME" > local.properties
-    # Install required Android components.
-    - echo y | android update sdk --filter platform-tools,build-tools-19.1.0,android-19,extra-android-support,extra-android-m2repository,$ANDROID_SDKS --no-ui -a --force
-    - echo yes | android update sdk --filter android-19 --no-ui --force > /dev/null
-    - echo yes | android update sdk --filter sysimg-19 --no-ui --force > /dev/null
-    - echo yes | android update sdk --filter extra-android-support --no-ui --force > /dev/null
-    - echo yes | android update sdk --filter extra-android-m2repository --no-ui --force > /dev/null
-    - echo yes | android update sdk --filter extra-google-m2repository --no-ui --force > /dev/null
-
-    # Create and start emulator
-    #- echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
-    #- emulator -avd test -no-skin -no-audio -no-window &
-
-#before_script:
-    # Make sure the emulator has started before running tests
-    #- ./wait_for_emulator
-
-#script: mvn install -Pintegration-tests -Dandroid.device=test
-#script:
-#  - echo $TRAVIS_BUILD_DIR
-#  - TERM=dumb cd full;../gradlew connectedCheck
+  - echo no | android create avd --force -n test -t $ANDROID_TARGET --abi $ANDROID_ABI
+  - emulator -avd test -no-skin -no-audio -no-window &
diff --git a/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java b/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java
index edee91c..b154dfe 100644
--- a/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java
+++ b/library/src/main/java/com/nononsenseapps/filepicker/FilePickerFragment.java
@@ -141,10 +141,13 @@ public class FilePickerFragment extends AbstractFilePickerFragment<File> {
             @Override
             public List<File> loadInBackground() {
                 ArrayList<File> files = new ArrayList<File>();
-                for (java.io.File f : currentPath.listFiles()) {
-                    if ((mode == MODE_FILE || mode == MODE_FILE_AND_DIR)
-                            || f.isDirectory()) {
-                        files.add(f);
+                File[] listFiles = currentPath.listFiles();
+                if(listFiles != null) {
+                    for (java.io.File f : listFiles) {
+                        if ((mode == MODE_FILE || mode == MODE_FILE_AND_DIR)
+                                || f.isDirectory()) {
+                            files.add(f);
+                        }
                     }
                 }
                 return files;