diff --git a/src/org/thoughtcrime/securesms/components/ThumbnailView.java b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
index 5a98fe2415..d8b5557533 100644
--- a/src/org/thoughtcrime/securesms/components/ThumbnailView.java
+++ b/src/org/thoughtcrime/securesms/components/ThumbnailView.java
@@ -177,7 +177,11 @@ public class ThumbnailView extends ForegroundImageView {
 
     @Override
     public void onClick(View view) {
-      listener.onClick(view, slide);
+      if (listener != null) {
+        listener.onClick(view, slide);
+      } else {
+        Log.w(TAG, "onClick, but no thumbnail click listener attached.");
+      }
     }
   }