Changed client to terminate rather that stop.