diff --git a/pungi/phases/createrepo.py b/pungi/phases/createrepo.py
index e0a1da9c..852af018 100644
--- a/pungi/phases/createrepo.py
+++ b/pungi/phases/createrepo.py
@@ -198,7 +198,7 @@ def create_variant_repo(compose, arch, variant, pkg_type, pkgset, modules_metada
         mod_index = Modulemd.ModuleIndex()
         metadata = []
 
-        for module_id, mmd in variant.arch_mmds[arch].items():
+        for module_id, mmd in variant.arch_mmds.get(arch, {}).items():
             if modules_metadata:
                 module_rpms = mmd.get_rpm_artifacts()
                 metadata.append((module_id, module_rpms))
diff --git a/pungi/phases/gather/sources/source_module.py b/pungi/phases/gather/sources/source_module.py
index 8e5de320..b2ef7adc 100644
--- a/pungi/phases/gather/sources/source_module.py
+++ b/pungi/phases/gather/sources/source_module.py
@@ -38,7 +38,7 @@ class GatherSourceModule(pungi.phases.gather.source.GatherSourceBase):
 
         compatible_arches = pungi.arch.get_compatible_arches(arch, multilib=True)
 
-        for nsvc, module_stream in variant.arch_mmds[arch].items():
+        for nsvc, module_stream in variant.arch_mmds.get(arch, {}).items():
             available_rpms = sum(
                 (
                     variant.nsvc_to_pkgset[nsvc].rpms_by_arch.get(a, [])