diff --git a/packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java b/packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java
index cebc9b05679e6..557a2f6abc9f3 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/RecentsLoader.java
@@ -157,6 +157,9 @@ public class RecentsLoader extends AsyncTaskLoader<DirectoryResult> {
                     throw new RuntimeException(e);
                 } catch (ExecutionException e) {
                     // We already logged on other side
+                } catch (Exception e) {
+                    Log.e(TAG, "Failed to query Recents for authority: " + task.authority
+                        + ". Skip this authority in Recents.", e);
                 }
             } else {
                 allDone = false;
diff --git a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
index 0a2960f8ffe04..94b8277f4eddc 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/dirlist/Model.java
@@ -107,7 +107,13 @@ public class Model {
         mSortOrder = result.sortOrder;
         doc = result.doc;
 
-        updateModelData();
+        try {
+            updateModelData();
+        } catch (Exception e) {
+            Log.e(TAG, "Error while accessing cursors", e);
+            notifyUpdateListeners(e);
+            return;
+        }
 
         final Bundle extras = mCursor.getExtras();
         if (extras != null) {