multistream fixes
error handling tweak