diff --git a/doc/release_notes.rst b/doc/release_notes.rst
index dbc857bc5..b73b56f8b 100644
--- a/doc/release_notes.rst
+++ b/doc/release_notes.rst
@@ -172,6 +172,10 @@ Upcoming Release
 
 * Bugfix: allow modelling sector-coupled landlocked regions. (Fixed handling of offshore wind.)
 
+* Bugfix: approximation of hydro power generation if Portugal or Spain are not included works now.
+
+* Bugfix: copy_timeslice does not copy anymore, if country not present in load data.
+
 * Adapt the disabling of transmission expansion in myopic foresight optimisations when limit is already reached to also handle cost limits.
 
 * Fix duplicated years and grouping years reference in `add_land_use_constraint_m`.
diff --git a/scripts/build_electricity_demand.py b/scripts/build_electricity_demand.py
index 7615bbc63..fc8af3720 100755
--- a/scripts/build_electricity_demand.py
+++ b/scripts/build_electricity_demand.py
@@ -129,7 +129,7 @@ def copy_timeslice(load, cntry, start, stop, delta, fn_load=None):
             load.loc[start:stop, cntry] = load.loc[
                 start - delta : stop - delta, cntry
             ].values
-        elif fn_load is not None:
+        elif fn_load is not None and cntry in load:
             duration = pd.date_range(freq="h", start=start - delta, end=stop - delta)
             load_raw = load_timeseries(fn_load, duration, [cntry])
             load.loc[start:stop, cntry] = load_raw.loc[
diff --git a/scripts/build_hydro_profile.py b/scripts/build_hydro_profile.py
index cd51ce907..6a0315c73 100644
--- a/scripts/build_hydro_profile.py
+++ b/scripts/build_hydro_profile.py
@@ -139,7 +139,10 @@ def approximate_missing_eia_stats(eia_stats, runoff_fn, countries):
     runoff.index = runoff.index.astype(int)
 
     # fix outliers; exceptional floods in 1977-1979 in ES & PT
-    runoff.loc[1978, ["ES", "PT"]] = runoff.loc[1979, ["ES", "PT"]]
+    if "ES" in runoff:
+        runoff.loc[1978, "ES"] = runoff.loc[1979, "ES"]
+    if "PT" in runoff:
+        runoff.loc[1978, "PT"] = runoff.loc[1979, "PT"]
 
     runoff_eia = runoff.loc[eia_stats.index]