re-raise error if error occurs before committing in streaming

Let errors get handled in the default way if an error occurs before
we start streaming.  This reverts #14000 but offers a better fix.