diff --git a/lib/galaxy/files/__init__.py b/lib/galaxy/files/__init__.py
index 8685dbfbe30..c1c51df37c8 100644
--- a/lib/galaxy/files/__init__.py
+++ b/lib/galaxy/files/__init__.py
@@ -4,6 +4,7 @@ from collections import (
     defaultdict,
     namedtuple,
 )
+from typing import Set
 
 from galaxy import exceptions
 from galaxy.util import (
@@ -246,16 +247,16 @@ class ProvidesUserFileSourcesUserContext:
         return user and user.extra_preferences or defaultdict(lambda: None)
 
     @property
-    def role_names(self):
+    def role_names(self) -> Set[str]:
         """The set of role names of this user."""
         user = self.trans.user
-        return user and set([ura.role.name for ura in user.roles])
+        return set(ura.role.name for ura in user.roles) if user else set()
 
     @property
-    def group_names(self):
+    def group_names(self) -> Set[str]:
         """The set of group names to which this user belongs."""
         user = self.trans.user
-        return user and set([ugr.group.name for ugr in user.groups])
+        return set(ugr.group.name for ugr in user.groups) if user else set()
 
     @property
     def is_admin(self):
diff --git a/lib/galaxy/util/bool_expressions.py b/lib/galaxy/util/bool_expressions.py
index cd93cb2ec89..2c45d4f5ad4 100644
--- a/lib/galaxy/util/bool_expressions.py
+++ b/lib/galaxy/util/bool_expressions.py
@@ -172,7 +172,7 @@ class TokenContainedEvaluator(TokenEvaluator):
         :param tokens: The list of tokens that should be evaluated to True.
         :type tokens: List[str]
         """
-        self.tokens = tokens
+        self.tokens = tokens or set()
 
     def evaluate(self, token: str) -> bool:
         return token in self.tokens