Server is now only killed when it is detected as running.