diff --git a/packaging/win32/dist-impl.sh b/packaging/win32/dist-impl.sh
index bea1b153c9..176d03e5ba 100755
--- a/packaging/win32/dist-impl.sh
+++ b/packaging/win32/dist-impl.sh
@@ -56,8 +56,8 @@ Please set AQBANKING_WITH_QT to yes and rerun install.sh first."
     add_to_env $_GNOME_UDIR/bin PATH # gconftool-2
     add_to_env $_EXETYPE_UDIR/bin PATH # exetype
 
-    PID=$$
-    configure_msys "$PID" "$_MINGW_WFSDIR"
+    _PID=$$
+    configure_msys "$_PID" "$_MINGW_WFSDIR"
 }
 
 function dist_aqbanking() {
diff --git a/packaging/win32/dist.sh b/packaging/win32/dist.sh
index 7f26067593..986181d57f 100755
--- a/packaging/win32/dist.sh
+++ b/packaging/win32/dist.sh
@@ -2,6 +2,12 @@
 
 set -e
 
+function on_error() {
+  setup "An error occurred, exiting."
+  restore_msys "$_PID"
+}
+trap on_error ERR
+
 function qpushd() { pushd "$@" >/dev/null; }
 function qpopd() { popd >/dev/null; }
 function unix_path() { echo "$*" | sed 's,^\([A-Za-z]\):,/\1,;s,\\,/,g'; }
@@ -44,7 +50,7 @@ for step in "${steps[@]}" ; do
 done
 
 setup Restore MSYS
-restore_msys "$PID"
+restore_msys "$_PID"
 
 qpopd
 
diff --git a/packaging/win32/install-impl.sh b/packaging/win32/install-impl.sh
old mode 100644
new mode 100755
diff --git a/packaging/win32/install.sh b/packaging/win32/install.sh
index 4586db0e5d..a40195106d 100644
--- a/packaging/win32/install.sh
+++ b/packaging/win32/install.sh
@@ -10,6 +10,12 @@
 
 set -e
 
+function on_error() {
+  setup "An error occurred, exiting."
+  restore_msys "$_PID"
+}
+trap on_error ERR
+
 echo -n "Build Starting at "
 date