remove retry warning, handle more errors