diff --git a/deploy.sh b/deploy.sh
index fb6a578..2228e7d 100644
--- a/deploy.sh
+++ b/deploy.sh
@@ -1,6 +1,11 @@
 #!/bin/sh
 
-declare destination
+function die() {
+    echo $*
+    exit 1
+}
+
+}declare destination
 case "${TARGET}" in
 	"${WWW_DEPLOY_ROOT_DEVELOP}")
 		destination="${TARGET}/${CI_BUILD_REF_NAME}"
@@ -9,33 +14,32 @@ case "${TARGET}" in
 		destination="${TARGET}"
 		;;
 	*)
-		echo "Invalid TARGET specified. Aborting deployment."
-		exit 1
+		die "Invalid TARGET specified. Aborting deployment."
 		;;
 esac
 
 if [[ ! -d "${destination}" ]] ; then
-    mkdir -p "${destination}" || echo "Failed to create target directory for deployment!"
+    mkdir -p "${destination}" || die "Failed to create target directory for deployment!"
 fi
 
 echo "Before any deletion:"
 ls "${destination}"
-rm -rf "${destination}/*"
+rm -rf "${destination}/*" || die "Failed to clean destination directory (step 1)"
 echo "After rm -rf dest/*:"
 ls "${destination}"
-rm -rf "${destination}/.??*"
+rm -rf "${destination}/.??*" || die "Failed to clean destination directory (step 2)"
 echo "After rm -rf dest/.??:"
 ls "${destination}"
 
-cp -a dencode.css index.html package.json systemjs.config.js "${destination}"
+cp -a dencode.css index.html package.json systemjs.config.js "${destination}" || die "Failed to copy resources to dest/"
 
-mkdir -p "${destination}/app"
-cp -a app/*.css app/*.html app/*.js app/*.js.map "${destination}/app"
+mkdir -p "${destination}/app" || die "Failed to create dest/app directory"
+cp -a app/*.css app/*.html app/*.js app/*.js.map "${destination}/app" || die "Failed to copy resources to dest/app"
 
-mkdir -p "${destination}/node_modules/core-js/client" "${destination}node_modules/zone.js/dist" "${destination}/node_modules/reflect-metadata" "${destination}/node_modules/systemjs/dist"
-cp -a node_modules/core-js/client/shim.js "${destination}/node_modules/core-js/client/"
-cp -a node_modules/zone.js/dist/zone.js "${destination}/node_modules/zone.js/dist/"
-cp -a node_modules/reflect-metadata/Reflect.js "${destination}/node_modules/reflect-metadata/"
-cp -a node_modules/systemjs/dist/system.src.js "${destination}/node_modules/systemjs/dist/"
+mkdir -p "${destination}/node_modules/core-js/client" "${destination}node_modules/zone.js/dist" "${destination}/node_modules/reflect-metadata" "${destination}/node_modules/systemjs/dist" || die "Failed to create dest/node_modules/* directories"
+cp -a node_modules/core-js/client/shim.js "${destination}/node_modules/core-js/client/" || die "Failed to copy core-js"
+cp -a node_modules/zone.js/dist/zone.js "${destination}/node_modules/zone.js/dist/" || die "Failed to copy zone.js"
+cp -a node_modules/reflect-metadata/Reflect.js "${destination}/node_modules/reflect-metadata/" || die "Failed to copy Reflect.js"
+cp -a node_modules/systemjs/dist/system.src.js "${destination}/node_modules/systemjs/dist/" || die "Failed to copy system.src.js"
 
 echo "Deployment successful."