diff --git a/xbps-src b/xbps-src
index 65fbf035442..9da59faa85f 100755
--- a/xbps-src
+++ b/xbps-src
@@ -675,10 +675,12 @@ case "$XBPS_TARGET" in
         ;;
 esac
 
+rval=$?
+
 if [ -n "$XBPS_TEMP_MASTERDIR" ]; then
     msg_normal "Removing temporary masterdir at $XBPS_MASTERDIR...\n"
     rm -rf $XBPS_MASTERDIR
 fi
 
 # Agur
-exit $?
+exit $rval