Better handling of shutdown state in client side.