diff --git a/ChangeLog b/ChangeLog
index f614e7799..0d4c7ac93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
-
 2008-03-06  Bastien Guerry  <bzg@altern.org>
 
 	* org.el (org-get-legal-level): Aliased to `org-get-valid-level'.
+	* org.el (org-get-tags-at): Bugfix: prevent `org-back-to-heading'
+	from throwing an error when getting tags before headlines.
 
 2008-03-06  Carsten Dominik  <dominik@science.uva.nl>
 
diff --git a/org.el b/org.el
index 406fb9ea8..9a841ecdc 100644
--- a/org.el
+++ b/org.el
@@ -23319,8 +23319,8 @@ the tags of the current headline come last."
 	(widen)
 	(goto-char (or pos (point)))
 	(save-match-data
-	  (org-back-to-heading t)
 	  (condition-case nil
+	      (org-back-to-heading t)
 	      (while (not (equal lastpos (point)))
 		(setq lastpos (point))
 		(if (looking-at (org-re "[^\r\n]+?:\\([[:alnum:]_@:]+\\):[ \t]*$"))