Systems Nutupane - Adding check that current_organization exists.