1 files changed, 3 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/data/FilterDeleteSet.java b/src/com/android/gallery3d/data/FilterDeleteSet.java
index 5c34fda70..799ea0e16 100644
--- a/src/com/android/gallery3d/data/FilterDeleteSet.java
+++ b/src/com/android/gallery3d/data/FilterDeleteSet.java
@@ -138,7 +138,9 @@ public class FilterDeleteSet extends MediaSet implements ContentListener {
         for (int m = j - 1; m >= i; m--) {
             Deletion d = mCurrent.get(m);
             int k = d.index - (start + i);
-            base.remove(k);
+            if (k >= 0 && k < base.size()) {
+                base.remove(k);
+            }
         }
         return base;
     }