diff --git a/src/main/java/eu/siacs/conversations/xml/XmlReader.java b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
index c775fd34c67804e00f21dbedbd26109dec3f9773..b6a3c6a012015f61a7052c1d9dd8a5653e71b36b 100644
--- a/src/main/java/eu/siacs/conversations/xml/XmlReader.java
+++ b/src/main/java/eu/siacs/conversations/xml/XmlReader.java
@@ -96,7 +96,7 @@ public class XmlReader implements Closeable {
 		}
 		while (!nextTag.isEnd(element.getName())) {
 			if (nextTag.isNo()) {
-				element.addChild(new TextNode(nextTag.getName()));
+				if (nextTag.getName() != null) element.addChild(new TextNode(nextTag.getName()));
 			} else {
 				Element child = this.readElement(nextTag);
 				element.addChild(child);