Streaming working, trying to get error case fixed