More error handling; allow retries