handle template errors
Merge branch 'master' of github.com:gavruk/crater