Improve server run check