Better handling for streamed responses