diff --git a/src/com/android/camera/AndroidCameraManagerImpl.java b/src/com/android/camera/AndroidCameraManagerImpl.java
index 89c7570..a1b092f 100644
--- a/src/com/android/camera/AndroidCameraManagerImpl.java
+++ b/src/com/android/camera/AndroidCameraManagerImpl.java
@@ -716,7 +716,8 @@
         public void onAutoFocusMoving(
                 final boolean moving, android.hardware.Camera camera) {
             final android.hardware.Camera currentCamera = mCamera.getCamera();
-
+            if(currentCamera == null)
+                return;
             mHandler.post(new Runnable() {
                 @Override
                 public void run() {