diff --git a/bubble_release.sh b/bubble_release.sh
index a358123..8ca8e7d 100755
--- a/bubble_release.sh
+++ b/bubble_release.sh
@@ -11,7 +11,7 @@ function die {
 }
 
 function platform_dist_zip {
-  BUILD_DIR=${1}
+  BUILD_DIR="${1}"
   case "$(uname -a | awk '{print $1}')" in
     Darwin*)
       cp ${THISDIR}/macos/flexrouter.plist ${BUILD_DIR} || die "Error copying macos files to BUILD_DIR: ${BUILD_DIR}"
@@ -21,12 +21,13 @@ function platform_dist_zip {
 
 function platform_dist_files {
   BUBBLE_SHA="${1}"
+  BUILD_DIR="${2}"
   case "$(uname -a | awk '{print $1}')" in
     Darwin*)
       cat ${THISDIR}/macos/install.sh \
       | sed -e "s/@@FR_DIST_VERSION@@/${BUBBLE_VERSION}/g" \
       | sed -e "s/@@FR_DIST_SHA@@/${BUBBLE_SHA}/g" \
-      > ${THISDIR}/install.sh || die "Error creating macos install.sh"
+      > ${BUILD_DIR}/install.sh || die "Error creating macos install.sh"
       ;;
   esac
 }
@@ -88,7 +89,7 @@ cd ${THISDIR} && \
   cd build && zip -D -X -r ${FLEX_DIST} bubble-flexrouter || die "Error building bubble-flexrouter dist zip file"
 
 cat ${FLEX_DIST} | ${SHA_CMD} | cut -f1 -d' ' | tr -d '\n' > ${FLEX_DIST}.sha256 || die "Error calculating SHA for bubble-flexrouter dist zip file"
-platform_dist_files "$(cat ${FLEX_DIST}.sha256)"
+platform_dist_files "$(cat ${FLEX_DIST}.sha256)" ${BUILD_DIR}
 
 if [[ ${MAKE_SYMLINKS} -eq 1 ]] ; then
   if [[ ${IS_DEV} -eq 0 ]] ; then
diff --git a/dist_jenkins.sh b/dist_jenkins.sh
index 8a4d11c..b8e24a1 100755
--- a/dist_jenkins.sh
+++ b/dist_jenkins.sh
@@ -33,6 +33,9 @@ fi
 
 if [[ ${IS_MACOS} -eq 1 ]] ; then
   LATEST_INSTALL_SH="$(find ${JENKINS_HOME}/jobs/${FLEX_PROJECT}/builds/${LATEST_BUILD}/archive/dist/releases/bubble-flexrouter/${FLEX_PROJECT}/${LATEST_VERSION} -maxdepth 1 -mindepth 1 -type f -name "install.sh" | head -1)"
+  if [[ -z "${LATEST_INSTALL_SH}" ]] ; then
+    die "No install.sh found"
+  fi
 fi
 
 RELEASE_TOP="${JENKINS_HOME}/public/public/releases/bubble-flexrouter/${FLEX_PROJECT}/"