diff --git a/scripts/functions.sh b/scripts/functions.sh
index 7b57674..e114d53 100644
--- a/scripts/functions.sh
+++ b/scripts/functions.sh
@@ -858,7 +858,7 @@ function gentoo_chroot() {
 		TMP_DIR="$TMP_DIR" \
 		CACHED_LSBLK_OUTPUT="$CACHED_LSBLK_OUTPUT" \
 		chroot -- "$chroot_dir" "$GENTOO_INSTALL_REPO_DIR/scripts/dispatch_chroot.sh" "$@" \
-			|| die "Failed to chroot into '$chroot_dir'"
+			|| die "Failed to chroot into '$chroot_dir', or the executed command returned an error."
 }
 
 function enable_service() {
diff --git a/scripts/main.sh b/scripts/main.sh
index a5b0d45..7dd3d55 100644
--- a/scripts/main.sh
+++ b/scripts/main.sh
@@ -250,7 +250,9 @@ function generate_fstab() {
 	einfo "Generating fstab"
 	install -m0644 -o root -g root "$GENTOO_INSTALL_REPO_DIR/contrib/fstab" /etc/fstab \
 		|| die "Could not overwrite /etc/fstab"
-	add_fstab_entry "UUID=$(get_blkid_uuid_for_id "$DISK_ID_ROOT")" "/" "$DISK_ID_ROOT_TYPE" "$DISK_ID_ROOT_MOUNT_OPTS" "0 1"
+	if [[ $USED_ZFS != "true" ]]; then
+		add_fstab_entry "UUID=$(get_blkid_uuid_for_id "$DISK_ID_ROOT")" "/" "$DISK_ID_ROOT_TYPE" "$DISK_ID_ROOT_MOUNT_OPTS" "0 1"
+	fi
 	if [[ $IS_EFI == "true" ]]; then
 		add_fstab_entry "UUID=$(get_blkid_uuid_for_id "$DISK_ID_EFI")" "/boot/efi" "vfat" "defaults,noatime,fmask=0177,dmask=0077,noexec,nodev,nosuid,discard" "0 2"
 	else