improve DSL error reporting
Merge pull request #124 from niallsmart/better-error-reporting

Improve DSL error reporting