diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index fdedcc0a2d..b02ae89263 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -1037,6 +1037,10 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
     ConversationFragment fragment = (ConversationFragment) getSupportFragmentManager()
         .findFragmentById(R.id.fragment_content);
 
+    if (fragment == null) {
+      return;
+    }
+
     if (refreshFragment) {
       fragment.reload(recipients, threadId);