diff --git a/misc/tune2fs.c b/misc/tune2fs.c
index e72518a..14529e3 100644
--- a/misc/tune2fs.c
+++ b/misc/tune2fs.c
@@ -1409,7 +1409,7 @@
 	set_undo_io_backing_manager(*io_ptr);
 	*io_ptr = undo_io_manager;
 	set_undo_io_backup_file(tdb_file);
-	printf(_("To undo the tune2fs operations please run "
+	printf(_("To undo the tune2fs operation please run "
 		 "the command\n    e2undo %s %s\n\n"),
 		 tdb_file, name);
 	free(tmp_name);
@@ -1652,6 +1652,13 @@
 				"unmounted.\n"), stderr);
 			exit(1);
 		}
+		if (fs->super->s_feature_incompat &
+		    EXT4_FEATURE_INCOMPAT_FLEX_BG) {
+			fputs(_("Changing the inode size not supported for filesystems "
+				"with the flex_bg\nfeature enabled.\n"),
+			      stderr);
+			exit(1);
+		}
 		/*
 		 * We want to update group descriptor also
 		 * with the new free inode count