diff --git a/filesystem/android/src/main/java/com/capacitorjs/plugins/filesystem/Filesystem.java b/filesystem/android/src/main/java/com/capacitorjs/plugins/filesystem/Filesystem.java
index c3fb54b44..402194184 100644
--- a/filesystem/android/src/main/java/com/capacitorjs/plugins/filesystem/Filesystem.java
+++ b/filesystem/android/src/main/java/com/capacitorjs/plugins/filesystem/Filesystem.java
@@ -61,7 +61,12 @@ public void saveFile(File file, String data, Charset charset, Boolean append) th
         } else {
             //remove header from dataURL
             if (data.contains(",")) {
-                data = data.split(",")[1];
+                String[] tmp = data.split(",");
+                if (tmp.length > 1) {
+                    data = tmp[1];
+                } else {
+                    throw new IllegalArgumentException("The supplied data is not valid base64 content.");
+                }
             }
             FileOutputStream fos = new FileOutputStream(file, append);
             fos.write(Base64.decode(data, Base64.NO_WRAP));