1 files changed, 11 insertions, 1 deletions
diff --git a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotPacketParser.java b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotPacketParser.java
index 85d11b6b..e2d629e4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotPacketParser.java
+++ b/src/main/java/de/thedevstack/conversationsplus/xmpp/filetransfer/http/upload/SlotPacketParser.java
@@ -2,8 +2,10 @@ package de.thedevstack.conversationsplus.xmpp.filetransfer.http.upload;
 
 import de.thedevstack.conversationsplus.xml.Element;
 import de.thedevstack.conversationsplus.xmpp.IqPacketParser;
+import de.thedevstack.conversationsplus.xmpp.exceptions.MissingRequiredElementException;
 import de.thedevstack.conversationsplus.xmpp.exceptions.UnexpectedIqPacketTypeException;
 import de.thedevstack.conversationsplus.xmpp.exceptions.XmppException;
+import de.thedevstack.conversationsplus.xmpp.filetransfer.http.FileTransferHttp;
 import de.thedevstack.conversationsplus.xmpp.stanzas.IqPacket;
 import de.thedevstack.conversationsplus.xmpp.utils.ErrorIqPacketExceptionHelper;
 
@@ -11,10 +13,18 @@ import de.thedevstack.conversationsplus.xmpp.utils.ErrorIqPacketExceptionHelper;
  *
  */
 public final class SlotPacketParser extends IqPacketParser {
+    private static final String SLOT_ELEMENT_NAME = "slot";
+
     public static HttpUploadSlot parseGetAndPutUrl(IqPacket packet) throws XmppException {
         HttpUploadSlot httpUploadSlot = null;
         if (packet.getType() == IqPacket.TYPE.RESULT) {
-            Element slot = findRequiredChild(packet, "slot", HttpUpload.NAMESPACE);
+            Element slot = findChild(packet, SLOT_ELEMENT_NAME, FileTransferHttp.NAMESPACE);
+            if (null == slot) {
+                slot = findChild(packet, SLOT_ELEMENT_NAME, HttpUpload.NAMESPACE);
+            }
+            if (null == slot) {
+                throw new MissingRequiredElementException(SLOT_ELEMENT_NAME, "neither " + FileTransferHttp.NAMESPACE + " nor " + HttpUpload.NAMESPACE, packet);
+            }
 
             String getUrl = findRequiredChildContent(slot, "get");
             String putUrl = findRequiredChildContent(slot, "put");