Properly return 404 when a template is not found
Merge pull request #299 from hongrich/v1

Properly return 404 when a template is not found