First pass of new error handling for streams