diff --git a/src/routes/tasks.js b/src/routes/tasks.js
index 0382b04da..76267d959 100644
--- a/src/routes/tasks.js
+++ b/src/routes/tasks.js
@@ -30,6 +30,7 @@ async function get(req, res, next) {
 
     const [error, task] = await safe(tasks.get(req.params.taskId));
     if (error) return next(BoxError.toHttpError(error));
+    if (!task) return next(new HttpError(404, 'task not found'));
 
     next(new HttpSuccess(200, tasks.removePrivateFields(task)));
 }
diff --git a/src/taskworker.js b/src/taskworker.js
index bffe7d848..11609d9ec 100755
--- a/src/taskworker.js
+++ b/src/taskworker.js
@@ -72,8 +72,8 @@ async.series([
     debug(`Starting task ${taskId}. Logs are at ${logFile}`);
 
     const [getError, task] = await safe(tasks.get(taskId));
-    if (getError) {
-        debug(getError);
+    if (getError || !task) {
+        debug(getError ? `Error getting task: ${getError.message}` : 'Task not found');
         return process.exit(50);
     }