Don't crash if Haystack is installed but Whoosh isn't.
Merge commit '6f95c20'