(#1809) - proper through stream for all docs, and handle errors