Add additional server shutdown checking.