Extra error trapping in title template
Merge branch 'dev' into release