Fix error reporting in layouts and includes
Merge pull request #1176 from visionmedia/fix/error-reporting-in-layouts-and-includes

Fix error reporting in layouts and includes