handle null will payloads
Merge pull request #229 from ekpneo/master

handle null will payloads