[streaming] Exception handling update & minor refactor