The client shuts down more gracefully now