diff --git a/lib/common.sh b/lib/common.sh
index cb9db76432204519ce4c13b34f2c83194190026c..04a282b8874c51ceca1179ef7156e09e0efb1aab 100644
--- a/lib/common.sh
+++ b/lib/common.sh
@@ -69,8 +69,8 @@ cleanup() {
 }
 
 abort() {
-	msg 'Aborting...'
-	cleanup 0
+	error 'Aborting...'
+	cleanup 255
 }
 
 trap_abort() {
@@ -85,7 +85,7 @@ trap_exit() {
 
 die() {
 	(( $# )) && error "$@"
-	cleanup 1
+	cleanup 255
 }
 
 trap 'trap_abort' INT QUIT TERM HUP