Better handling of remote stream close