Fixes #1 moves error handling to on the Stream, right before the consume(), which is where it should have been to begin with.