1 files changed, 2 insertions, 2 deletions
diff --git a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
index ceb37a2fd..cca4d5fc2 100644
--- a/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
+++ b/src/main/java/de/pixart/messenger/services/XmppConnectionService.java
@@ -2710,7 +2710,7 @@ public class XmppConnectionService extends Service {
                     }
 
                     if (bookmark != null && (sameBefore || bookmark.getBookmarkName() == null)) {
-                        if (bookmark.setBookmarkName(mucOptions.getName())) {
+                        if (bookmark.setBookmarkName(StringUtils.nullOnEmpty(mucOptions.getName()))) {
                             pushBookmarks(account);
                         }
                     }
@@ -2800,7 +2800,7 @@ public class XmppConnectionService extends Service {
     }
 
     public void pushSubjectToConference(final Conversation conference, final String subject) {
-        MessagePacket packet = this.getMessageGenerator().conferenceSubject(conference, subject);
+        MessagePacket packet = this.getMessageGenerator().conferenceSubject(conference, StringUtils.nullOnEmpty(subject));
         this.sendMessagePacket(conference.getAccount(), packet);
     }