Better handle stream response