Check templates for fields and compilation
Merge pull request #596 from chilts/make-template-loading-more-robust

Check templates for fields and compilation