Avoid failures due to bad payload selection