Fix: Handle exit from stopping a client