1 files changed, 1 insertions, 1 deletions

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index a2b5b7d1c4e..5081874ca90 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -310,7 +310,7 @@ slow things down!")
                     (narrow-to-region s e)
                     (while (not (eobp))
                       (let ((next (next-single-property-change (point) 'face)))
-                        (if (> next (point-max))
+                        (if (or (null next) (> next (point-max)))
                             (setq next (point-max)))
                         (if (not (get-text-property (point) 'face))
                             (put-text-property (point) next 'face face))