Client exiting fix