diff --git a/hack/generate_versions.sh b/hack/generate_versions.sh
index f15285d..902bcef 100644
--- a/hack/generate_versions.sh
+++ b/hack/generate_versions.sh
@@ -1,6 +1,7 @@
 #!/bin/bash
 
-artifacts=$(bazel query //src/... 2>/dev/null | grep +publish)
+BAZEL=${BAZEL:-bazel}
+artifacts=$($BAZEL query //src/... 2>/dev/null | grep +publish)
 publishedServices=${artifacts//$'//src/'/}
 publishedServices=${publishedServices//$':+publish'/}
 
@@ -19,7 +20,7 @@ addShaToServiceList() {
 
 for service in $publishedServices; do
   shaSum=$(getSha $service)
-  addShaToServiceList $service $shaSum
+  test $shaSum && addShaToServiceList $service $shaSum
 done
 
 echo $artifactList | jq
\ No newline at end of file