>> I think avoiding the call if the function is not available is the 
>> cleanest solution, one that we use elsewhere in Emacs in similar cases.
>
> That sounds reasonable, yes.
>

And here is the patch.  As I just said, I'm not entirely convinced that 
it's better, but it isn't much worse either.