Improve error handling
Merge branch 'ci' into ci-grunt