diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 152a215e4..ecaaeae6a 100755
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,8 @@
 2009-11-05  Carsten Dominik  <carsten.dominik@gmail.com>
 
+	* org-icalendar.el (org-print-icalendar-entries): Use
+	org-icalendar-verify-function only if non-nil.
+
 	* org.el (org-refile): Refile to clock only if the prefix arg is
 	2.
 	(org-sparse-tree): Fix docstring to be in line with prompt.
diff --git a/lisp/org-icalendar.el b/lisp/org-icalendar.el
index bee27b8c4..2efe8b687 100644
--- a/lisp/org-icalendar.el
+++ b/lisp/org-icalendar.el
@@ -280,7 +280,7 @@ When COMBINE is non nil, add the category to each line."
       (while (re-search-forward re1 nil t)
 	(catch :skip
 	  (org-agenda-skip)
-	  (when (boundp 'org-icalendar-verify-function)
+	  (when org-icalendar-verify-function
 	    (unless (funcall org-icalendar-verify-function)
 	      (outline-next-heading)
 	      (backward-char 1)
@@ -403,7 +403,7 @@ END:VEVENT\n"
 	(while (re-search-forward org-todo-line-regexp nil t)
 	  (catch :skip
 	    (org-agenda-skip)
-	    (when (boundp 'org-icalendar-verify-function)
+	    (when org-icalendar-verify-function
 	      (unless (save-match-data
 			(funcall org-icalendar-verify-function))
 		(outline-next-heading)