=== modified file 'lisp/org/org.el'
--- lisp/org/org.el	2011-05-23 17:57:17 +0000
+++ lisp/org/org.el	2011-06-15 14:54:19 +0000
@@ -5096,6 +5096,11 @@
   :group 'org-babel)
 
 (defun org-fontify-meta-lines-and-blocks (limit)
+  (condition-case nil
+      (org-fontify-meta-lines-and-blocks-1 limit)
+    (error (message "org-mode fontification error"))))
+
+(defun org-fontify-meta-lines-and-blocks-1 (limit)
   "Fontify #+ lines and blocks, in the correct ways."
   (let ((case-fold-search t))
     (if (re-search-forward