diff --git a/bash/release/gupload b/bash/release/gupload
index e79f928..0a930e7 100755
--- a/bash/release/gupload
+++ b/bash/release/gupload
@@ -1016,7 +1016,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line; do
+    while read -r line && [[ -n ${line} ]]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"
 
diff --git a/bash/upload.bash b/bash/upload.bash
index 2c759db..30b30dc 100755
--- a/bash/upload.bash
+++ b/bash/upload.bash
@@ -76,7 +76,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line; do
+    while read -r line && [[ -n ${line} ]]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"
 
diff --git a/sh/release/gupload b/sh/release/gupload
index 6f59aac..55e06eb 100755
--- a/sh/release/gupload
+++ b/sh/release/gupload
@@ -1003,7 +1003,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line <&4; do
+    while read -r line <&4 && [ -n "${line}" ]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"
 
diff --git a/sh/upload.sh b/sh/upload.sh
index 5a2604f..dc90299 100755
--- a/sh/upload.sh
+++ b/sh/upload.sh
@@ -77,7 +77,7 @@ _cleanup_config() {
 
     ! [ -f "${config}" ] && return 0
 
-    while read -r line <&4; do
+    while read -r line <&4 && [ -n "${line}" ]; do
         expiry_value_name="${line%%=*}"
         token_value_name="${expiry_value_name%%_EXPIRY}"