1 files changed, 7 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/data/ImageCacheRequest.java b/src/com/android/gallery3d/data/ImageCacheRequest.java
index 104ff4839..0accd3f27 100644
--- a/src/com/android/gallery3d/data/ImageCacheRequest.java
+++ b/src/com/android/gallery3d/data/ImageCacheRequest.java
@@ -75,9 +75,16 @@ abstract class ImageCacheRequest implements Job<Bitmap> {
                 bitmap = BitmapUtils.resizeDownBySideLength(bitmap,
                         mTargetSize, true);
             }
+            if (bitmap == null) {
+                return null;
+            }
             if (jc.isCancelled()) return null;
 
             byte[] array = BitmapUtils.compressBitmap(bitmap);
+            if (array == null) {
+                return null;
+            }
+
             if (jc.isCancelled()) return null;
 
             cacheService.putImageData(mPath, mType, array);