closes issue #29 when body is null then trows an exception
solve merge conflict