diff --git a/units/std/defaultCellsFrom/dev/configs.nix b/units/std/defaultCellsFrom/dev/configs.nix
index 63885f9..3818a23 100644
--- a/units/std/defaultCellsFrom/dev/configs.nix
+++ b/units/std/defaultCellsFrom/dev/configs.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.configs.exports.default
+cell.pops.configs.exports.default or { }
diff --git a/units/std/defaultCellsFrom/dev/data.nix b/units/std/defaultCellsFrom/dev/data.nix
index 1e5b598..c2a01ce 100644
--- a/units/std/defaultCellsFrom/dev/data.nix
+++ b/units/std/defaultCellsFrom/dev/data.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.data.exports.default
+cell.pops.data.exports.default or { }
diff --git a/units/std/defaultCellsFrom/dev/devshellProfiles.nix b/units/std/defaultCellsFrom/dev/devshellProfiles.nix
index be3864a..14a6fde 100644
--- a/units/std/defaultCellsFrom/dev/devshellProfiles.nix
+++ b/units/std/defaultCellsFrom/dev/devshellProfiles.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.devshellProfiles.exports.default
+cell.pops.devshellProfiles.exports.default or { }
diff --git a/units/std/defaultCellsFrom/dev/scripts.nix b/units/std/defaultCellsFrom/dev/scripts.nix
index fd8d93d..33def23 100644
--- a/units/std/defaultCellsFrom/dev/scripts.nix
+++ b/units/std/defaultCellsFrom/dev/scripts.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.scripts.exports.default
+cell.pops.scripts.exports.default or { }
diff --git a/units/std/defaultCellsFrom/dev/shells.nix b/units/std/defaultCellsFrom/dev/shells.nix
index 3e6474d..c61adf5 100644
--- a/units/std/defaultCellsFrom/dev/shells.nix
+++ b/units/std/defaultCellsFrom/dev/shells.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.shells.exports.default
+cell.pops.shells.exports.default or { }
diff --git a/units/std/defaultCellsFrom/dev/tasks.nix b/units/std/defaultCellsFrom/dev/tasks.nix
index b71d269..2f94cb4 100644
--- a/units/std/defaultCellsFrom/dev/tasks.nix
+++ b/units/std/defaultCellsFrom/dev/tasks.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.tasks.exports.default
+cell.pops.tasks.exports.default or { }
diff --git a/units/std/defaultCellsFrom/prod/configs.nix b/units/std/defaultCellsFrom/prod/configs.nix
index 63885f9..3818a23 100644
--- a/units/std/defaultCellsFrom/prod/configs.nix
+++ b/units/std/defaultCellsFrom/prod/configs.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.configs.exports.default
+cell.pops.configs.exports.default or { }
diff --git a/units/std/defaultCellsFrom/prod/data.nix b/units/std/defaultCellsFrom/prod/data.nix
index 1e5b598..c2a01ce 100644
--- a/units/std/defaultCellsFrom/prod/data.nix
+++ b/units/std/defaultCellsFrom/prod/data.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.data.exports.default
+cell.pops.data.exports.default or { }
diff --git a/units/std/defaultCellsFrom/prod/devshellProfiles.nix b/units/std/defaultCellsFrom/prod/devshellProfiles.nix
index be3864a..14a6fde 100644
--- a/units/std/defaultCellsFrom/prod/devshellProfiles.nix
+++ b/units/std/defaultCellsFrom/prod/devshellProfiles.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.devshellProfiles.exports.default
+cell.pops.devshellProfiles.exports.default or { }
diff --git a/units/std/defaultCellsFrom/prod/scripts.nix b/units/std/defaultCellsFrom/prod/scripts.nix
index fd8d93d..33def23 100644
--- a/units/std/defaultCellsFrom/prod/scripts.nix
+++ b/units/std/defaultCellsFrom/prod/scripts.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.scripts.exports.default
+cell.pops.scripts.exports.default or { }
diff --git a/units/std/defaultCellsFrom/prod/shells.nix b/units/std/defaultCellsFrom/prod/shells.nix
index 3e6474d..c61adf5 100644
--- a/units/std/defaultCellsFrom/prod/shells.nix
+++ b/units/std/defaultCellsFrom/prod/shells.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.shells.exports.default
+cell.pops.shells.exports.default or { }
diff --git a/units/std/defaultCellsFrom/prod/tasks.nix b/units/std/defaultCellsFrom/prod/tasks.nix
index b71d269..2f94cb4 100644
--- a/units/std/defaultCellsFrom/prod/tasks.nix
+++ b/units/std/defaultCellsFrom/prod/tasks.nix
@@ -2,4 +2,4 @@
 #
 # SPDX-License-Identifier: MIT
 
-cell.pops.tasks.exports.default
+cell.pops.tasks.exports.default or { }