remove NPE on saveOrganization