0
@@ -280,7 +280,7 @@ encode_handler_payload({response, [ErlStruct]}, ID, RpcType) ->   % {{{
0
 encode_handler_payload({response, ErlStruct}, ID, RpcType) ->
0
     StructStr =
0
   case RpcType of
0
-	    json -> json:encode({struct, [ {result, ErlStruct}, {id, ID}]});
0
+	    json -> json:encode({struct, [ {result, ErlStruct}, {id, case ID of undefined -> ""; Defined -> Defined end}]});
0
       haxe -> [$h, $x, $r | haxe:encode(ErlStruct)]
0
   end,
0
     {ok, StructStr}.  % }}}
0
@@ -289,7 +289,7 @@ decode_handler_payload(json, JSonStr) -> %{{{
0
     try 
0
         {ok, Obj} = json:decode_string(JSonStr),
0
         Method = list_to_atom(jsonrpc:s(Obj, method)),
0
-        {array, Args} = jsonrpc:s(Obj, params),
0
+        {_Kind, Args} = jsonrpc:s(Obj, params),
0
         ID = jsonrpc:s(Obj, id),
0
         {ok, {call, Method, Args}, ID}
0
     catch