diff --git a/[refs] b/[refs]
index 1b1aa1d84b28..4e277a540294 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43b38520296d0c1730c78c878e1d6d1a49122091
+refs/heads/master: 78f1ddbb498283c2445c11b0dfa666424c301803
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 8f4f079e6b9a..fe3f376b7df2 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -344,7 +344,8 @@ static const char *ext4_decode_error(struct super_block *sb, int errno,
 		errstr = "Out of memory";
 		break;
 	case -EROFS:
-		if (!sb || EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT)
+		if (!sb || (EXT4_SB(sb)->s_journal &&
+			    EXT4_SB(sb)->s_journal->j_flags & JBD2_ABORT))
 			errstr = "Journal has aborted";
 		else
 			errstr = "Readonly filesystem";