Improve Stream error handling #88