Add error handling to gulpfile.js
Merge remote-tracking branch 'base/master'