diff --git a/extras/firmware.sh b/extras/firmware.sh
index 3a44fd7f52..d92b229160 100644
--- a/extras/firmware.sh
+++ b/extras/firmware.sh
@@ -45,7 +45,7 @@ build_firmware()
 	mv armbian-firmware${FULL} armbian-firmware${FULL}_${REVISION}_${ARCH}
 	dpkg -b armbian-firmware${FULL}_${REVISION}_${ARCH} >> $DEST/debug/install.log 2>&1
 	mv armbian-firmware${FULL}_${REVISION}_${ARCH} armbian-firmware${FULL}
-	mv armbian-firmware${FULL}_${REVISION}_${ARCH}.deb $DEST/debs/ || exit_with_error "Failed moving firmware package"
+	mv armbian-firmware${FULL}_${REVISION}_${ARCH}.deb $DEST/debs/ || display_alert "Failed moving firmware package" "" "wrn"
 }
 
 FULL=""
diff --git a/extras/tools.sh b/extras/tools.sh
index 7d4bcc939e..880cab03e7 100644
--- a/extras/tools.sh
+++ b/extras/tools.sh
@@ -67,14 +67,16 @@ compile_tools()
 		if [[ $? -ne 0 || ! -f $tmpdir/temper/src/pcsensor ]]; then
 			cd $CACHEDIR
 			rm -rf $tmpdir
-			exit_with_error "Error building" "temper"
+			display_alert "Error building" "temper" "wrn"
+			return
 		fi
 		display_alert "... compiling" "bluetooth utils" "info"
 		chroot $CACHEDIR/sdcard /bin/bash -c "cd /root/tools/brcm; make $CTHREADS" >> $DEST/debug/tools-build.log 2>&1
 		if [[ $? -ne 0 || ! -f $tmpdir/brcm/brcm_bt_reset ]]; then
 			cd $CACHEDIR
 			rm -rf $tmpdir
-			exit_with_error "Error building" "BT utils"
+			display_alert "Error building" "BT utils" "wrn"
+			return
 		fi
 	}