diff --git a/xbps-src/shutils/metadata.sh b/xbps-src/shutils/metadata.sh
index 33d7817281a..de2c9ae4b8a 100644
--- a/xbps-src/shutils/metadata.sh
+++ b/xbps-src/shutils/metadata.sh
@@ -370,8 +370,8 @@ _EOF
 	mv -f $TMPFPLIST ${DESTDIR}/files.plist
 	mv -f $TMPFPROPS ${DESTDIR}/props.plist
 
-	$XBPS_PKGDB_CMD sanitize-plist ${DESTDIR}/files.plist || exit 1
-	$XBPS_PKGDB_CMD sanitize-plist ${DESTDIR}/props.plist || exit 1
+	$XBPS_PKGDB_CMD sanitize-plist ${DESTDIR}/files.plist || return 1
+	$XBPS_PKGDB_CMD sanitize-plist ${DESTDIR}/props.plist || return 1
 	chmod 644 ${DESTDIR}/files.plist ${DESTDIR}/props.plist
 	[ -f $metadir/flist ] && chmod 644 $metadir/flist
 
@@ -380,6 +380,6 @@ _EOF
 	# or uses any available trigger.
 	#
 	. ${XBPS_SHUTILSDIR}/metadata_scripts.sh
-	xbps_write_metadata_scripts_pkg install
-	xbps_write_metadata_scripts_pkg remove
+	xbps_write_metadata_scripts_pkg install || return $?
+	xbps_write_metadata_scripts_pkg remove || return $?
 }