diff --git a/usr/share/archboot/installer/setup b/usr/share/archboot/installer/setup
index 01d611c77..1ff9f878a 100755
--- a/usr/share/archboot/installer/setup
+++ b/usr/share/archboot/installer/setup
@@ -548,6 +548,8 @@ autoprepare() {
 	# invoke sfdisk
 	printk off
 	DIALOG --infobox "Partitioning $DEVICE" 0 0
+	# clean partitiontable to avoid issues!
+	dd if=/dev/zero of=$DEVICE bs=512 count=1
 	sfdisk $DEVICE -uM >$LOG 2>&1 <<EOF
 $sfdisk_input
 EOF
diff --git a/usr/share/archboot/keymap/km b/usr/share/archboot/keymap/km
index 065a3b97d..9c7bfe7b6 100755
--- a/usr/share/archboot/keymap/km
+++ b/usr/share/archboot/keymap/km
@@ -72,10 +72,12 @@ doconsolefont() {
 				setfont $BASEDIR/consolefonts/$font -C /dev/tty${i}
 			fi
 		done
-		[ -e /dev/ttys0 ] &&  setfont $BASEDIR/consolefonts/$font -C /dev/ttyS0
 		if [ $? -gt 0 ]; then
 			error_consoleset
 		fi
+		if [ -e /dev/ttyS0 ]; then 
+			setfont $BASEDIR/consolefonts/$font -C /dev/ttyS0 || error_consoleset
+		fi
 	fi
 S_NEXTITEM=3
 }