diff --git a/templates/app/gulpfile.babel.js b/templates/app/gulpfile.babel.js
index 3272062f0..dae0cb2f5 100644
--- a/templates/app/gulpfile.babel.js
+++ b/templates/app/gulpfile.babel.js
@@ -236,6 +236,9 @@ gulp.task('webpack:dist', function() {
     const webpackDistConfig = makeWebpackConfig({ BUILD: true });
     return gulp.src(webpackDistConfig.entry.app)
         .pipe(webpack(webpackDistConfig))
+        .on('error', (err) => {
+          this.emit('end'); // Recover from errors
+        })
         .pipe(gulp.dest(`${paths.dist}/client`));
 });
 
@@ -491,8 +494,8 @@ gulp.task('build', cb => {
         'inject',
         'transpile:server',
         [
-            'build:images',
-            'typings'
+            'build:images'<% if(filters.ts) { %>,
+            'typings'<% } %>
         ],
         [
             'copy:extras',