1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 995fdc0aa..fab8c5ea7 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -529,8 +529,10 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     protected void deleteBookmark() {
         Account account = mConversation.getAccount();
         Bookmark bookmark = mConversation.getBookmark();
-        bookmark.setConversation(null);
-        account.getBookmarks().remove(bookmark);
+        if (bookmark != null) {
+            account.getBookmarks().remove(bookmark);
+            bookmark.setConversation(null);
+        }
         xmppConnectionService.pushBookmarks(account);
         updateView();
     }