Fixed improper exception handling
Merge pull request #604 from MediaCrush/fix_template_not_found

Fixed improper exception handling