Move server stop inside commands