1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/gallery3d/app/PhotoPageBottomControls.java b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
index 24b8ceb7e..57f8b6f35 100644
--- a/src/com/android/gallery3d/app/PhotoPageBottomControls.java
+++ b/src/com/android/gallery3d/app/PhotoPageBottomControls.java
@@ -130,7 +130,8 @@ public class PhotoPageBottomControls implements OnClickListener {
 
     @Override
     public void onClick(View view) {
-        if (mContainerVisible && mControlsVisible.get(view).booleanValue()) {
+        Boolean controlVisible = mControlsVisible.get(view);
+        if (mContainerVisible && controlVisible != null && controlVisible.booleanValue()) {
             mDelegate.onBottomControlClicked(view.getId());
         }
     }