Merge "Check connection's error stream before reading from it"