Added org null check on site register