SERVER-SHUTDOWN: fixing None check as per pull request comments