diff --git a/README.md b/README.md
index e9d5aa5..5f488f8 100755
--- a/README.md
+++ b/README.md
@@ -354,8 +354,6 @@ Git commit freezing used for DXVK & meson. Reasons:
 
 - Add info about selected commits and branches (if they have not been set to default)
 
-- Remove temp folders in case of failure (meson/glslang/dxvk-git/wine... temp build folders)
-
 - Unify error & warning messages layout, unify internal variable & function names
 
 - Common script clean-up
diff --git a/arch/updatewine_arch.sh b/arch/updatewine_arch.sh
index 3475d50..59bb691 100755
--- a/arch/updatewine_arch.sh
+++ b/arch/updatewine_arch.sh
@@ -112,6 +112,9 @@ function Arch_intCleanup() {
 # Allow interruption of the script at any time (Ctrl + C)
 trap "Arch_intCleanup" INT
 
+# Error event
+trap "Arch_intCleanup" ERR
+
 ###########################################################
 
 # Check existence of ccache package
diff --git a/debian/dxvkroot/dxvkbuild.sh b/debian/dxvkroot/dxvkbuild.sh
index dec4fcb..fc19f0d 100755
--- a/debian/dxvkroot/dxvkbuild.sh
+++ b/debian/dxvkroot/dxvkbuild.sh
@@ -196,6 +196,9 @@ function DXVK_intCleanup() {
 # Allow interruption of the script at any time (Ctrl + C)
 trap "DXVK_intCleanup" INT
 
+# Error event
+trap "DXVK_intCleanup" ERR
+
 ########################################################
 
 # http://wiki.bash-hackers.org/snipplets/print_horizontal_line#a_line_across_the_entire_width_of_the_terminal
diff --git a/debian/wineroot/winebuild.sh b/debian/wineroot/winebuild.sh
index a6ff905..ae1fb30 100755
--- a/debian/wineroot/winebuild.sh
+++ b/debian/wineroot/winebuild.sh
@@ -368,6 +368,9 @@ function Wine_intCleanup() {
 # Allow interruption of the script at any time (Ctrl + C)
 trap "Wine_intCleanup" INT
 
+# Error event
+trap "Wine_intCleanup" ERR
+
 ########################################################
 
 # This is specifically for Debian