diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 44501ac6b..8ff651cd3 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2010-04-01  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-entities.el (org-entity-get-representation): Catch the case
+	that there is not entry in the list.
+
 	* org-mobile.el (org-mobile-use-encryption)
 	(org-mobile-encryption-tempfile, org-mobile-encryption-password):
 	New options.
diff --git a/lisp/org-entities.el b/lisp/org-entities.el
index 47bbdb639..5a12bda36 100644
--- a/lisp/org-entities.el
+++ b/lisp/org-entities.el
@@ -429,7 +429,8 @@ Kind can be any of `latex', `html', `ascii', `latin1', or `utf8'."
 	 (n (cdr (assq kind '((latex . 1) (html . 3) (ascii . 4)
 			      (latin1 . 5) (utf8 . 6)))))
 	 (r (and e n (nth n e))))
-    (if (and (not org-entities-ascii-explanatory)
+    (if (and e r
+	     (not org-entities-ascii-explanatory)
 	     (memq kind '(ascii latin1 utf8))
 	     (= (string-to-char r) ?\[))
 	(concat "\\" name)