1 files changed, 5 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
index 52c296c78..30d535d77 100644
--- a/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
+++ b/src/com/android/gallery3d/filtershow/cache/ImageLoader.java
@@ -108,7 +108,7 @@ public final class ImageLoader {
                     new String[] { MediaStore.Images.ImageColumns.ORIENTATION },
                     null, null, null);
             if (cursor != null && cursor.moveToNext()) {
-                int ori = cursor.getInt(0);
+                int ori = cursor.getColumnIndexOrThrow(MediaStore.Images.ImageColumns.ORIENTATION);
                 switch (ori) {
                     case 90:
                         return ORI_ROTATE_90;
@@ -147,6 +147,8 @@ public final class ImageLoader {
             return parseExif(exif);
         } catch (IOException e) {
             Log.w(LOGTAG, "Failed to read EXIF orientation", e);
+        } catch (NullPointerException e) {
+            Log.w(LOGTAG, "Invalid EXIF data", e);
         } finally {
             try {
                 if (is != null) {
@@ -576,6 +578,8 @@ public final class ImageLoader {
                 return taglist;
             } catch (IOException e) {
                 Log.w(LOGTAG, "Failed to read EXIF tags", e);
+            } catch (NullPointerException e) {
+                Log.e(LOGTAG, "Failed to read EXIF tags", e);
             }
         }
         return null;