Merge "Fix DoS in Error Streams"