diff --git a/src/org/thoughtcrime/securesms/ConversationListFragment.java b/src/org/thoughtcrime/securesms/ConversationListFragment.java
index 5bc410b0b..638fc84b5 100644
--- a/src/org/thoughtcrime/securesms/ConversationListFragment.java
+++ b/src/org/thoughtcrime/securesms/ConversationListFragment.java
@@ -17,6 +17,7 @@
 package org.thoughtcrime.securesms;
 
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.content.res.TypedArray;
@@ -595,9 +596,17 @@ public class ConversationListFragment extends Fragment
   @Override
   public void handleEvent(@NonNull DcEvent event) {
     if (event.getId() == DcContext.DC_EVENT_CONNECTIVITY_CHANGED) {
-      ((ConversationListActivity) getActivity()).refreshTitle();
+      Activity activity = getActivity();
+      if (activity != null) {
+        ((ConversationListActivity) activity).refreshTitle();
+      }
+
     } else if (event.getId() == DcContext.DC_EVENT_SELFAVATAR_CHANGED) {
-      ((ConversationListActivity) getActivity()).refreshAvatar();
+      Activity activity = getActivity();
+      if (activity != null) {
+        ((ConversationListActivity) activity).refreshAvatar();
+      }
+
     } else {
       loadChatlistAsync();
     }