diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java index 12ee0c763..655244e26 100644 --- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java +++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java @@ -311,7 +311,7 @@ public class ConversationFragment extends XmppFragment }; private void loadMoreMessages(boolean paginateBackward, boolean paginationForward, AbsListView view) { - if (paginateBackward && !conversation.messagesLoaded.get()) { + if (paginateBackward && (conversation != null && !conversation.messagesLoaded.get())) { paginateBackward = false; }