more error logging and retries