diff --git a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
index 2efcf1e..5da0e49 100644
--- a/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
+++ b/src/com/android/documentsui/prefs/ScopedAccessLocalPreferences.java
@@ -173,7 +173,10 @@
                 Log.w(TAG, "error gettting value for key '" + key + "': " + value);
                 continue;
             }
-            permissions.add(getPermission(key, status));
+            final Permission permission = getPermission(key, status);
+            if (permission != null) {
+                permissions.add(permission);
+            }
         }
 
         return permissions;
diff --git a/tests/AndroidTest.xml b/tests/AndroidTest.xml
index a051df2..07968ae 100644
--- a/tests/AndroidTest.xml
+++ b/tests/AndroidTest.xml
@@ -23,5 +23,6 @@
     <test class="com.android.tradefed.testtype.AndroidJUnitTest" >
         <option name="package" value="com.android.documentsui.tests" />
         <option name="runner" value="android.support.test.runner.AndroidJUnitRunner" />
+        <option name="hidden-api-checks" value="false"/>
     </test>
 </configuration>