LPS-39680 unable to add site due to missing null check