diff --git a/abuild-sign.in b/abuild-sign.in
index 5890bf5..1ce3a88 100644
--- a/abuild-sign.in
+++ b/abuild-sign.in
@@ -26,7 +26,7 @@ do_sign() {
 		i=$(readlink -f $f)
 		[ -d "$i" ] && i="$i/APKINDEX.tar.gz"
 		repo="${i%/*}"
-		(
+		trap 'die "failed to sign $i"' EXIT
 		set -e
 		cd "$repo"
 		sig=".SIGN.RSA.$keyname"
@@ -39,7 +39,8 @@ do_sign() {
 		chmod 644 "$tmpsigned"
 		mv "$tmpsigned" "$i"
 		msg "Signed $i"
-		) || die "failed to sign $i"
+		set +e
+		trap - EXIT
 	done
 }