Picks up SIGTERM support and suppression of an expected error at
shutdown-time.