gracefully recover from #698