diff --git a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
index e76bb393a..93cf5270c 100644
--- a/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
+++ b/smack-core/src/main/java/org/jivesoftware/smack/packet/XMPPError.java
@@ -199,7 +199,14 @@ public class XMPPError extends AbstractError {
 
         xml.halfOpenElement(condition.toString());
         xml.xmlnsAttribute(NAMESPACE);
-        xml.closeEmptyElement();
+        if (conditionText != null) {
+            xml.rightAngleBracket();
+            xml.escape(conditionText);
+            xml.closeElement(condition.toString());
+        }
+        else {
+            xml.closeEmptyElement();
+        }
 
         addDescriptiveTextsAndExtensions(xml);