Simplified failure/retry logic