diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 42526c4c1..913a0deec 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-01-09  Carsten Dominik  <carsten.dominik@gmail.com>
+
+	* org-indent.el (org-indent-add-properties): Catch case when there
+	is no headline in the buffer.
+
 2010-01-08  Carsten Dominik  <carsten.dominik@gmail.com>
 
 	* org-exp.el (org-html-entities): Add checkmark symbol.
diff --git a/lisp/org-indent.el b/lisp/org-indent.el
index 2bba5d157..127415f52 100644
--- a/lisp/org-indent.el
+++ b/lisp/org-indent.el
@@ -227,7 +227,7 @@ Assumes that BEG is at the beginning of a line."
 	      b  e (list 'line-prefix (aref org-indent-strings n)
 			 'wrap-prefix (aref org-indent-strings n))))
 	   (setq b (1+ (point-at-eol))
-		 n (* level org-indent-indentation-per-level))))))))
+		 n (* (or level 0) org-indent-indentation-per-level))))))))
 
 (defun org-indent-refresh-section ()
   "Refresh indentation properties in the current outline section.