Better handling of the 'no template' case