potential fix for ClientShutdown exceptions