catch rare NPE while deleting bookmark

1 files changed, 8 insertions, 3 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
index 49e0e081f..580a61686 100644
--- a/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/ConferenceDetailsActivity.java
@@ -422,9 +422,14 @@ public class ConferenceDetailsActivity extends XmppActivity implements OnConvers
     protected void deleteBookmark() {
         final Account account = mConversation.getAccount();
         final Bookmark bookmark = mConversation.getBookmark();
-        bookmark.setConversation(null);
-        xmppConnectionService.deleteBookmark(account, bookmark);
-        updateView();
+        try {
+            bookmark.setConversation(null);
+            xmppConnectionService.deleteBookmark(account, bookmark);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            updateView();
+        }
     }
 
     @Override