diff --git a/components/node/files/scripts/common.sh b/components/node/files/scripts/common.sh
index 8db9ab8..69f4928 100644
--- a/components/node/files/scripts/common.sh
+++ b/components/node/files/scripts/common.sh
@@ -15,9 +15,17 @@ pingSentinel() {
 }
 
 getPrimaryInfo() {
-    VALKEY_MASTER_NAME=${VALKEY_MASTER_NAME:-"mymaster"}
-    valkey-cli --csv -h ${VALKEY_HEADLESS_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel get-primary-addr-by-name "${VALKEY_MASTER_NAME}"| \
-        awk -F ',' '{ gsub(/"/,"",$0); print $1 " " $2 }'
+    masterName=${VALKEY_MASTER_NAME:-"mymaster"}
+    info=$(valkey-cli --csv -h ${VALKEY_HEADLESS_SERVICE} -p ${VALKEY_SENTINEL_PORT} sentinel get-primary-addr-by-name "${masterName}"| \
+        awk -F ',' '{ gsub(/"/,"",$0); print $1 " " $2 }')
+    if [ -z "${info}" ]; then
+        echo "Failed to get primary info for master '${masterName}'"
+        return 1
+    fi
+    if [ "${info}" ~= /^NULL/ ]; then
+        getPrimaryInfo
+    fi
+    echo "${info}"
     return ${?}
 }