diff --git a/modules/builder.py b/modules/builder.py
index 24403caf..991ea965 100644
--- a/modules/builder.py
+++ b/modules/builder.py
@@ -1458,7 +1458,7 @@ class CollectionBuilder:
                     elif modifier in [".before", ".after"]:
                         if current_data is None:
                             return False
-                        filter_date = util.validate_date(filter_data)
+                        filter_date = util.validate_date(filter_data, filter_final)
                         if (modifier == ".before" and current_data >= filter_date) or (modifier == ".after" and current_data <= filter_date):
                             return False
                 elif filter_attr in ["release", "added", "last_played"] and modifier == ".regex":
diff --git a/modules/tmdb.py b/modules/tmdb.py
index ea0278c3..a3065403 100644
--- a/modules/tmdb.py
+++ b/modules/tmdb.py
@@ -253,7 +253,7 @@ class TMDb:
         count = 0
         for date_attr in discover_dates:
             if date_attr in attrs:
-                attrs[date_attr] = util.validate_date(attrs[date_attr], return_as="%Y-%m-%d")
+                attrs[date_attr] = util.validate_date(attrs[date_attr], f"tmdb_discover attribute {date_attr}", return_as="%Y-%m-%d")
         self.Discover.discover_movies(attrs) if is_movie else self.Discover.discover_tv_shows(attrs)
         total_pages = int(self.TMDb.total_pages)
         total_results = int(self.TMDb.total_results)