fixed npe when no payload given