o Check for none in payload detection. Closes: #4933