diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/sd-bic b/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/sd-bic
index 8fa3ed1727e3..1548133c3b79 100755
--- a/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/sd-bic
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/sd-bic
@@ -9,6 +9,11 @@ version=$(
         jq --raw-output '.ActiveComponentImageSetVersionString'
 )
 
+if [ -z "$version" ]; then
+    echo "Failed to get slot$slot sd bic version"
+    exit 1
+fi
+
 busctl set-property \
     xyz.openbmc_project.Settings \
     "/xyz/openbmc_project/software/host$slot/Sentinel_Dome_bic" \
diff --git a/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/wf-bic b/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/wf-bic
index 58763ac7b348..f60163ea1fdf 100755
--- a/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/wf-bic
+++ b/meta-facebook/meta-yosemite4/recipes-facebook/fw-versions/files/wf-bic
@@ -11,6 +11,11 @@ version=$(
         jq --raw-output '.ActiveComponentImageSetVersionString'
 )
 
+if [ -z "$version" ]; then
+    echo "Failed to get slot$slot wf bic version"
+    exit 1
+fi
+
 busctl set-property \
     xyz.openbmc_project.Settings \
     "/xyz/openbmc_project/software/host$slot/Wailua_Falls_bic" \