1 files changed, 5 insertions, 1 deletions
diff --git a/lib/soap/encodingstyle/soapHandler.rb b/lib/soap/encodingstyle/soapHandler.rb
index 114060bd02..134a2ae8b8 100644
--- a/lib/soap/encodingstyle/soapHandler.rb
+++ b/lib/soap/encodingstyle/soapHandler.rb
@@ -404,7 +404,7 @@ private
 
   def decode_defined_complextype(elename, typename, typedef, arytypestr)
     case typedef.compoundtype
-    when :TYPE_STRUCT
+    when :TYPE_STRUCT, :TYPE_MAP
       o = SOAPStruct.decode(elename, typename)
       o.definedtype = typedef
       return o
@@ -421,6 +421,9 @@ private
       end
       o.definedtype = typedef
       return o
+    else
+      raise RuntimeError.new(
+        "Unknown kind of complexType: #{typedef.compoundtype}")
     end
     nil
   end
@@ -537,6 +540,7 @@ private
         id = value
         next
       end
+      qname = ns.parse_local(key)
       extraattr[qname] = decode_attr_value(ns, qname, value)
     end