diff --git a/scripts/mash_run.sh b/scripts/mash_run.sh
index 14cc9cc..c37fe8a 100755
--- a/scripts/mash_run.sh
+++ b/scripts/mash_run.sh
@@ -132,7 +132,9 @@ mash_prepare ()
 		( $optionv ) && echo " -> [INFO] updating mash config ${tag}.mash"
 		mv $conf ${MASH_CONF}/${tag}.mash
 		( $optionv ) && echo " -> [INFO] cleaning mash cache ${tag}.buildlist"
-                rm $MASH_CACHE/${tag}.buildlist
+        rm $MASH_CACHE/${tag}.buildlist
+	else
+		rm $conf
 	fi
 }
 
@@ -174,7 +176,8 @@ do
 	FAKETAG=${TAG/testing/candidate}
 	FAKETAG=${FAKETAG/release/candidate}
 	BUILDTAG=`${KOJI} list-targets --quiet | grep ${FAKETAG}| awk '{print $2}'`
-	ARCHES=`${KOJI} taginfo ${BUILDTAG} | grep Arches | cut -d ":" -f 2-`
+	[ ! -z "$BUILDTAG" ] && ARCHES=`${KOJI} taginfo ${BUILDTAG} | grep Arches | cut -d ":" -f 2-`
+	[ -z "$ARCHES" ] && ARCHES="x86_64"
 	[ -z "$ARCHES" ] && ARCHES="x86_64"
 	mash_prepare "${TAG}" "${LOG}" "${ARCHES}"
 	if [ ! -f $MASH_CACHE/$TAG.buildlist ]