Handle search failures better