Fix crash on streaming client exit

Change-Id: I9bc7b83852a1b9490adfa796026d8f5f54455a10