Likewise, prevent viewhelper from crashing in extremis
Merge branch 'master' into tp-2.4.0-sparql