am f1b12df3: Merge "Trigger error only when a template is instantiated."

* commit 'f1b12df3dd7d070a62544d309593aea554f93c27':
  Trigger error only when a template is instantiated.