CB-6338 Improve error for missing template