diff --git a/alws/release_planner.py b/alws/release_planner.py
index 24e4d30f9..03888f38b 100644
--- a/alws/release_planner.py
+++ b/alws/release_planner.py
@@ -1824,6 +1824,9 @@ async def check_released_errata_packages(
         )
         albs_pkgs = albs_pkgs.scalars().all()
 
+        if not albs_pkgs:
+            return
+
         # We assume that a release involves only one errata.
         # If it is not the case, we need to check the errata record status
         # of every errata_to_albs_packages and taking them into account when
diff --git a/alws/utils/noarch.py b/alws/utils/noarch.py
index 48a4616c6..5085830db 100644
--- a/alws/utils/noarch.py
+++ b/alws/utils/noarch.py
@@ -91,7 +91,10 @@ async def save_noarch_packages(
     debug_hrefs_to_add = [href for href, _ in debug_noarch_packages.values()]
 
     for task in build_tasks:
-        if task.status in (BuildTaskStatus.FAILED, BuildTaskStatus.EXCLUDED):
+        if (
+            task.status in (BuildTaskStatus.FAILED, BuildTaskStatus.EXCLUDED)
+            or task.arch == 'src'
+        ):
             continue
         noarch = copy.deepcopy(noarch_packages)
         debug_noarch = copy.deepcopy(debug_noarch_packages)