2 files changed, 2 insertions, 2 deletions
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
index 9307851f3965..fd4d7b2bf19c 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -62,7 +62,7 @@ public class GridItemAdapter extends BaseAdapter {
     }
 
     public int getCount() {
-        return filePaths.size();
+        return filePaths != null ? filePaths.size() : 0;
     }
 
     public Object getItem(int position) {
diff --git a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index 9435c09299a4..e12141b0c021 100644
--- a/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/experimental/LOAndroid3/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -602,7 +602,7 @@ public class LibreOfficeUIActivity extends LOAbout implements ActionBar.OnNaviga
         }
 
         public int getCount() {
-            return filePaths.size();
+            return filePaths != null ? filePaths.size() : 0;
         }
 
         public Object getItem(int arg0) {