diff --git a/scripts/cluster_gas_network.py b/scripts/cluster_gas_network.py
index 6d4e6c48..b95c4580 100755
--- a/scripts/cluster_gas_network.py
+++ b/scripts/cluster_gas_network.py
@@ -58,6 +58,9 @@ def build_clustered_gas_network(df, bus_regions, length_factor=1.25):
     # drop pipes within the same region
     df = df.loc[df.bus1 != df.bus0]
 
+    if df.empty:
+        return df
+
     # recalculate lengths as center to center * length factor
     df["length"] = df.apply(
         lambda p: length_factor
diff --git a/scripts/prepare_sector_network.py b/scripts/prepare_sector_network.py
index eaaf207d..5b28c1b4 100644
--- a/scripts/prepare_sector_network.py
+++ b/scripts/prepare_sector_network.py
@@ -2775,10 +2775,11 @@ def add_industry(n, costs):
         )
 
     domestic_navigation = pop_weighted_energy_totals.loc[
-        nodes, "total domestic navigation"
+        nodes, ["total domestic navigation"]
     ].squeeze()
     international_navigation = (
-        pd.read_csv(snakemake.input.shipping_demand, index_col=0).squeeze() * nyears
+        pd.read_csv(snakemake.input.shipping_demand, index_col=0).squeeze(axis=1)
+        * nyears
     )
     all_navigation = domestic_navigation + international_navigation
     p_set = all_navigation * 1e6 / nhours
@@ -3946,12 +3947,11 @@ if __name__ == "__main__":
 
         snakemake = mock_snakemake(
             "prepare_sector_network",
-            # configfiles="test/config.overnight.yaml",
             simpl="",
             opts="",
-            clusters="37",
-            ll="v1.0",
-            sector_opts="730H-T-H-B-I-A-dist1",
+            clusters="1",
+            ll="vopt",
+            sector_opts="",
             planning_horizons="2050",
         )