diff --git a/lisp/org.el b/lisp/org.el
index a9285ee59..ede9e59c1 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5590,7 +5590,7 @@ by a #."
 		 '(font-lock-fontified t invisible t)
 	       '(font-lock-fontified t face org-document-info-keyword)))
 	    (add-text-properties
-	     (match-beginning 6) (1+ (match-end 6))
+	     (match-beginning 6) (min (point-max) (1+ (match-end 6)))
 	     (if (string-equal dc1 "+title:")
 	    	 '(font-lock-fontified t face org-document-title)
 	       '(font-lock-fontified t face org-document-info))))