Added logic to account for cases when either an argument or a payloaddescriptor is null