diff --git a/build_deb_from_dsc_with_update.sh b/build_deb_from_dsc_with_update.sh
index f8685a4..01bd85d 100644
--- a/build_deb_from_dsc_with_update.sh
+++ b/build_deb_from_dsc_with_update.sh
@@ -45,25 +45,25 @@ FILESTAMP=$(date '+%Y-%m-%d-%H-%M')-$(uuidgen -t)
 BUILD_DIR=${BUILDDIR}/build-${FILESTAMP}
 
 echo "Building in ${BUILD_DIR}"
-mkdir -p ${BUILD_DIR}
-cd ${BUILD_DIR}
+mkdir -p "${BUILD_DIR}"
+cd "${BUILD_DIR}" || ezit
 
 # Download the package to build
 echo "RUNNING: gbp import-dsc -v --allow-unauthenticated ${DSC_FILE}"
-gbp import-dsc -v --allow-unauthenticated ${DSC_FILE}
+gbp import-dsc -v --allow-unauthenticated "${DSC_FILE}"
 
 if [ $? -ne 0 ]; then
   echo "gbp import-dsc failed to connect."
-  exit 0
+  exit 1
 fi
 
-cd *
+cd * || exit
 
 # Install the build deps
 mk-build-deps debian/control --install --root-cmd sudo --remove
 
 # Build the packages
-if [ -d debian ]; then
+if [ -d debian/watch ]; then
   # dpkg-buildpackage -us -uc -b
   export lang=en_GB.UTF-8
   gbp import-orig --pristine-tar --uscan
@@ -76,3 +76,5 @@ fi
 # else
 # 	echo "No debs to install, did the package build complete successfully?"
 # fi
+
+# gbp buildpackage --git-pristine-tar --git-ignore-new --git-export-dir=".." -us -uc