Add call to HasTenant instead of isset