Just make sure client is getting quitted properly here