diff --git a/scripts/generate-version-info.sh b/scripts/generate-version-info.sh
index 3f75cc01d..94ded309c 100644
--- a/scripts/generate-version-info.sh
+++ b/scripts/generate-version-info.sh
@@ -16,8 +16,19 @@ OUTPUT_FILE="$1"
 sudo rpm --query --all --queryformat '\{"%{NAME}": "%{VERSION}-%{RELEASE}"\}\n' | jq --slurp --sort-keys 'add | {packages:(.)}' > "$OUTPUT_FILE"
 
 # binaries
-echo $(jq ".binaries.kubelet = \"$(kubelet --version | awk '{print $2}')\"" $OUTPUT_FILE) > $OUTPUT_FILE
-echo $(jq ".binaries.awscli = \"$(aws --version | awk '{print $1}' | cut -d '/' -f 2)\"" $OUTPUT_FILE) > $OUTPUT_FILE
+KUBELET_VERSION=$(kubelet --version | awk '{print $2}')
+if [ "$?" != 0 ]; then
+  echo "unable to get kubelet version"
+  exit 1
+fi
+echo $(jq ".binaries.kubelet = \"$KUBELET_VERSION\"" $OUTPUT_FILE) > $OUTPUT_FILE
+
+CLI_VERSION=$(aws --version | awk '{print $1}' | cut -d '/' -f 2)
+if [ "$?" != 0 ]; then
+  echo "unable to get aws cli version"
+  exit 1
+fi
+echo $(jq ".binaries.awscli = \"$CLI_VERSION\"" $OUTPUT_FILE) > $OUTPUT_FILE
 
 # cached images
 if systemctl is-active --quiet containerd; then