Fixed variable not being set if there's no payload.