diff --git a/src/taskworker.js b/src/taskworker.js
index fbff783c9..5aeed0ec2 100755
--- a/src/taskworker.js
+++ b/src/taskworker.js
@@ -67,6 +67,9 @@ async.series([
 
     process.on('SIGTERM', () => process.exit(0)); // sent as timeout notification
 
+    // ensure we log task crashes with the task logs
+    process.on('uncaughtException', function (e) { debug(e); process.exit(1); });
+
     debug(`Starting task ${taskId}. Logs are at ${logFile}`);
 
     tasks.get(taskId, function (error, task) {