Agenda Breaks on holidays: cl-return-from: No catch for tag

Agenda Breaks on holidays: cl-return-from: No catch for tag

[Tory S. Anderson]

When I try to pull up time span including a holiday, my agenda dies (stops generating, buffer says "not viewing agenda") and I get the following error in my messages: 

    cl-return-from: No catch for tag: --cl-block-nil--, org-agenda-date-weekend

It may have something to do with the holiday/weekend markup I use: 

    ;; Holiday/weekends in agenda
;;; Agenda holiday display
(setq org-agenda-day-face-function
      (defun jd:org-agenda-day-face-holidays-function (date)
        "Compute DATE face for holidays."
        (unless (org-agenda-todayp date)
          (dolist (file (org-agenda-files nil 'ifmode))
            (let ((face
                   (dolist (entry (org-agenda-get-day-entries file date))
                     (let ((category (with-temp-buffer
                                       (insert entry)
                                       (org-get-category (point-min)))))
                       (when (or (string= "Holiday" category)
                                 (string= "Vacation" category))
                         (return 'org-agenda-date-weekend))))))
              (when face (return face)))))))


Why is my agenda breaking on holidays (but not weekends)?