Add sanity check

...and retry requests that failed it.