Minor improvement to client stream closing