From a1ef1cbaaa6023cf87bbb9a64452c1d0f1aeb06f Mon Sep 17 00:00:00 2001
From: Nathaniel Cook <nvcook42@gmail.com>
Date: Fri, 2 Mar 2018 11:06:21 -0700
Subject: [PATCH] fix deadlock in load service if task has error

---
 CHANGELOG.md                | 2 ++
 services/task_store/util.go | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1f16658a4..48d7fb663 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,8 @@
 
 ### Bugfixes
 
+- [#1827](https://github.com/influxdata/kapacitor/pull/1827): Fix deadlock in load service when task has an error.
+
 
 ## v1.4.0 [2017-12-08]
 
diff --git a/services/task_store/util.go b/services/task_store/util.go
index fd746bd7f..fd7ba4f6b 100644
--- a/services/task_store/util.go
+++ b/services/task_store/util.go
@@ -75,6 +75,9 @@ func taskTypeFromProgram(n *ast.ProgramNode) client.TaskType {
 						tts = append(tts, ident)
 					}
 					break ChainLoop
+				default:
+					// Something went wrong, break out of loop.
+					break ChainLoop
 				}
 			}
 		}