fix some NPEs caused during dual server work