Modified Client code to try and guarantee quick shutdowns occur.