diff --git a/create_asm_file.sh b/create_asm_file.sh
index c38ab0fcf8c091d8eba06453f6bb777078e7261b..fb48cd3f14cc768fbfd66db63ff92290db5e8353 100755
--- a/create_asm_file.sh
+++ b/create_asm_file.sh
@@ -19,71 +19,28 @@ success()
     exit 0
 }
 
+set -e
+
 rm -rf crypto/aes/asm/arm32
 rm -rf crypto/modes/asm/arm32
 mkdir crypto/aes/asm/arm32
 mkdir crypto/modes/asm/arm32
 # for arm32:
 perl crypto/aes/asm/aes-armv4.pl void crypto/aes/asm/arm32/aes-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/aes/asm/aesv8-armx.pl void crypto/aes/asm/arm32/aesv8-armx.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/aes/asm/bsaes-armv7.pl void crypto/aes/asm/arm32/bsaes-armv7.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/armv4cpuid.pl void crypto/armv4cpuid.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/bn/asm/armv4-gf2m.pl void crypto/bn/armv4-gf2m.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/bn/asm/armv4-mont.pl void crypto/bn/armv4-mont.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/chacha/asm/chacha-armv4.pl void crypto/chacha/chacha-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/ec/asm/ecp_nistz256-armv4.pl void crypto/ec/ecp_nistz256-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/modes/asm/ghash-armv4.pl void crypto/modes/asm/arm32/ghash-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/modes/asm/ghashv8-armx.pl void crypto/modes/asm/arm32/ghashv8-armx.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/poly1305/asm/poly1305-armv4.pl void crypto/poly1305/poly1305-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/keccak1600-armv4.pl void crypto/sha/keccak1600-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/sha1-armv4-large.pl void crypto/sha/sha1-armv4-large.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/sha256-armv4.pl void crypto/sha/sha256-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/sha512-armv4.pl void crypto/sha/sha512-armv4.S
-if [ $? -ne 0 ]; then
-    error
-fi
 
 rm -rf crypto/aes/asm/arm64
 rm -rf crypto/modes/asm/arm64
@@ -91,49 +48,16 @@ mkdir crypto/aes/asm/arm64
 mkdir crypto/modes/asm/arm64
 # for arm64:
 perl crypto/aes/asm/aesv8-armx.pl linux64 crypto/aes/asm/arm64/aesv8-armx.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/aes/asm/vpaes-armv8.pl linux64 crypto/aes/asm/arm64/vpaes-armv8.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/arm64cpuid.pl linux64 crypto/arm64cpuid.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/bn/asm/armv8-mont.pl linux64 crypto/bn/armv8-mont.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/chacha/asm/chacha-armv8.pl linux64 crypto/chacha/chacha-armv8.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/ec/asm/ecp_nistz256-armv8.pl linux64 crypto/ec/ecp_nistz256-armv8.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/modes/asm/ghashv8-armx.pl linux64 crypto/modes/asm/arm64/ghashv8-armx.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/poly1305/asm/poly1305-armv8.pl linux64 crypto/poly1305/poly1305-armv8.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/keccak1600-armv8.pl linux64 crypto/sha/keccak1600-armv8.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/sha1-armv8.pl linux64 crypto/sha/sha1-armv8.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/sha512-armv8.pl linux64 crypto/sha/sha256-armv8.S
-if [ $? -ne 0 ]; then
-    error
-fi
 perl crypto/sha/asm/sha512-armv8.pl linux64 crypto/sha/sha512-armv8.S
 if [ $? -ne 0 ]; then
     error