diff --git a/scripts/1-fetch/gcs_fetch.py b/scripts/1-fetch/gcs_fetch.py
index 6533deb9..9f2b781e 100755
--- a/scripts/1-fetch/gcs_fetch.py
+++ b/scripts/1-fetch/gcs_fetch.py
@@ -259,6 +259,7 @@ def query_gcs(args, service, last_completed_plan_index, plan):
                         initial_delay *= 2  # Exponential backoff
                 else:
                     LOGGER.error(f"Error fetching results: {e}")
+                    break
         if success:
             append_data(args, plan_row, index, count)
         else:
diff --git a/scripts/plot.py b/scripts/plot.py
index c7f47366..fcbdb817 100644
--- a/scripts/plot.py
+++ b/scripts/plot.py
@@ -21,7 +21,7 @@ def annotate_ylabels(ax, data, data_label, colors):
     #    defaults: ytick.major.size         + ytick.major.pad
     indent = -1 * (ytick.get_tick_padding() + ytick.get_pad())
     for index, row in data.iterrows():
-        if c > len(colors):
+        if c >= len(colors):
             c = 0
 
         # annotate totals
diff --git a/scripts/shared.py b/scripts/shared.py
index 83a53b53..e9a48ee6 100644
--- a/scripts/shared.py
+++ b/scripts/shared.py
@@ -220,8 +220,11 @@ def update_readme(
         entry_start_index = lines.index(entry_start_line)
         entry_end_index = lines.index(entry_end_line)
         # Include any trailing empty/whitespace-only lines
-        while not lines[entry_end_index + 1].strip():
-            entry_end_index += 1
+        while entry_end_index + 1 < len(lines):
+            if not lines[entry_end_index + 1].strip():
+                entry_end_index += 1
+            else:
+                break
     # Initalize variables of entry is not present
     else:
         entry_start_index = None