1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/camera/Camera.java b/src/com/android/camera/Camera.java
index 589a5c8..2c1662b 100644
--- a/src/com/android/camera/Camera.java
+++ b/src/com/android/camera/Camera.java
@@ -1503,8 +1503,10 @@ public class Camera extends ActivityBase implements FocusManager.Listener,
 
         if (mFirstTimeInitialized) {
             mOrientationListener.disable();
-            mImageSaver.finish();
-            mImageSaver = null;
+            if (mImageSaver != null) {
+                mImageSaver.finish();
+                mImageSaver = null;
+            }
             if (!mIsImageCaptureIntent && mThumbnail != null && !mThumbnail.fromFile()) {
                 mThumbnail.saveTo(new File(getFilesDir(), Thumbnail.LAST_THUMB_FILENAME));
             }