diff --git a/src/main/java/eu/siacs/conversations/entities/Bookmark.java b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
index 76c314a3e9d2e34418a3598711dd1788b81586bd..eb8f3328dd64c8d9f8240f011f69320b2f1d94f9 100644
--- a/src/main/java/eu/siacs/conversations/entities/Bookmark.java
+++ b/src/main/java/eu/siacs/conversations/entities/Bookmark.java
@@ -159,8 +159,15 @@ public class Bookmark extends Element implements ListItem {
 	}
 
 	public Jid getFullJid() {
-		final String nick = getNick();
-		return jid == null || nick == null || nick.trim().isEmpty() ? jid : jid.withResource(nick);
+		final String nick = Strings.nullToEmpty(getNick()).trim();
+		if (jid == null || nick.isEmpty()) {
+			return jid;
+		}
+		try {
+			return jid.withResource(nick);
+		} catch (final IllegalArgumentException e) {
+			return jid;
+		}
 	}
 
 	@Override