Fixes #8495

-- "Client crashes when server dies unexpectedly."