Slightly improve server stop checking