diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index bed7ba7..0c07cbd 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -333,6 +333,9 @@
                         Log.e(TAG, "Fail to release the camera.");
                     }
                     mCamera = null;
+                } else if (mCamera == null) {
+                  Log.w(TAG, "Cannot handle message, mCamera is null.");
+                  return;
                 }
                 throw e;
             }