Better argument check for retries