[streaming] Updated exception handling
[streaming] Merged conflicts