Added a null checks to the OrganizationRepository