From 041e6eb5f30c978b0294757004ce68409de55f34 Mon Sep 17 00:00:00 2001
From: Alex Dadgar <alex.dadgar@gmail.com>
Date: Thu, 16 Jun 2016 11:44:27 -0700
Subject: [PATCH] Guard against restoring a nil task in task_runner

---
 client/task_runner.go | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/client/task_runner.go b/client/task_runner.go
index 26679803f..3d76da860 100644
--- a/client/task_runner.go
+++ b/client/task_runner.go
@@ -146,7 +146,13 @@ func (r *TaskRunner) RestoreState() error {
 	}
 
 	// Restore fields
-	r.task = snap.Task
+	if snap.Task == nil {
+		err := fmt.Errorf("task runner snapshot include nil Task")
+		r.logger.Printf("[ERR] client: %v", err)
+		return err
+	} else {
+		r.task = snap.Task
+	}
 	r.artifactsDownloaded = snap.ArtifactDownloaded
 
 	if err := r.setTaskEnv(); err != nil {