Working on accepting empty payloads correctly.