@pcragone Shouldn’t this be something like `raise ActsAsTenant::ScopeNotSet unless ActsAsTenant.current_tenant` here?