1 files changed, 13 insertions, 1 deletions
diff --git a/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java b/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java
index 33d064d..47373f8 100644
--- a/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java
+++ b/src/com/isode/stroke/serializer/payloadserializers/ErrorSerializer.java
@@ -12,11 +12,16 @@ package com.isode.stroke.serializer.payloadserializers;
 import com.isode.stroke.elements.ErrorPayload;
 import com.isode.stroke.serializer.GenericPayloadSerializer;
 import com.isode.stroke.serializer.xml.XMLTextNode;
+import com.isode.stroke.serializer.PayloadSerializerCollection;
+import com.isode.stroke.serializer.PayloadSerializer;
 
 class ErrorSerializer extends GenericPayloadSerializer<ErrorPayload> {
 
-    public ErrorSerializer() {
+	private PayloadSerializerCollection serializers;
+
+    public ErrorSerializer(PayloadSerializerCollection serializers) {
         super(ErrorPayload.class);
+        this.serializers = serializers;
     }
 
     @Override
@@ -63,6 +68,13 @@ class ErrorSerializer extends GenericPayloadSerializer<ErrorPayload> {
 		result += "<text xmlns=\"urn:ietf:params:xml:ns:xmpp-stanzas\">" + textNode.serialize() + "</text>";
 	}
 
+	if (error.getPayload() != null) {
+		PayloadSerializer serializer = serializers.getPayloadSerializer(error.getPayload());
+		if (serializer != null) {
+			result += serializer.serialize(error.getPayload());
+		}
+	}
+
 	result += "</error>";
 	return result;
     }