LPS-34896 Fix NPE when adding new sites