1 files changed, 9 insertions, 4 deletions
diff --git a/photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java b/photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
index 3cc387f..bf75ecb 100644
--- a/photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
+++ b/photoviewer/src/com/android/ex/photo/adapters/PhotoPagerAdapter.java
@@ -55,10 +55,15 @@ public class PhotoPagerAdapter extends BaseCursorPagerAdapter {
 
     @Override
     public Cursor swapCursor(Cursor newCursor) {
-        mContentUriIndex =
-                newCursor.getColumnIndex(PhotoContract.PhotoViewColumns.CONTENT_URI);
-        mThumbnailUriIndex =
-                newCursor.getColumnIndex(PhotoContract.PhotoViewColumns.THUMBNAIL_URI);
+        if (newCursor != null) {
+            mContentUriIndex =
+                    newCursor.getColumnIndex(PhotoContract.PhotoViewColumns.CONTENT_URI);
+            mThumbnailUriIndex =
+                    newCursor.getColumnIndex(PhotoContract.PhotoViewColumns.THUMBNAIL_URI);
+        } else {
+            mContentUriIndex = -1;
+            mThumbnailUriIndex = -1;
+        }
 
         return super.swapCursor(newCursor);
     }