diff --git a/horde/classes/base/waiting_prompt.py b/horde/classes/base/waiting_prompt.py
index 9ca678cb..506cd105 100644
--- a/horde/classes/base/waiting_prompt.py
+++ b/horde/classes/base/waiting_prompt.py
@@ -313,10 +313,8 @@ def is_completed(self):
             .filter(
                 procgen_class.wp_id == self.id,
                 procgen_class.fake.is_(False),
-                or_(
-                    procgen_class.faulted.is_(False),
-                    procgen_class.generation.is_(None),
-                ),
+                procgen_class.faulted.is_(False),
+                procgen_class.generation.is_(None),
             )
             .count()
         )
diff --git a/horde/classes/stable/processing_generation.py b/horde/classes/stable/processing_generation.py
index b0c35ad4..76f48d9f 100644
--- a/horde/classes/stable/processing_generation.py
+++ b/horde/classes/stable/processing_generation.py
@@ -79,7 +79,7 @@ def log_aborted_generation(self):
     def set_generation(self, generation, things_per_sec, **kwargs):
         state = kwargs.get("state", "ok")
         censored = False
-        gen_metadata = kwargs.get("gen_metadata") or []
+        gen_metadata = kwargs.get("gen_metadata") if kwargs.get("gen_metadata") is not None else []
         for metadata in gen_metadata:
             if metadata.get("type") != "censorship":
                 # this metadata isnt about censorship