From 199011eee01b5cb2bdd0e30683264af36f02199b Mon Sep 17 00:00:00 2001
From: derekwaynecarr <decarr@redhat.com>
Date: Thu, 16 Apr 2015 18:07:11 -0400
Subject: [PATCH] Fix nil pointer in etcd tools

---
 pkg/tools/etcd_helper.go | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkg/tools/etcd_helper.go b/pkg/tools/etcd_helper.go
index c1911bf129b..2da0bcc9f13 100644
--- a/pkg/tools/etcd_helper.go
+++ b/pkg/tools/etcd_helper.go
@@ -160,7 +160,10 @@ func (h *EtcdHelper) ExtractObjToList(key string, listObj runtime.Object) error
 	}
 
 	response, err := h.Client.Get(key, false, false)
-	if err != nil && !IsEtcdNotFound(err) {
+	if err != nil {
+		if IsEtcdNotFound(err) {
+			return nil
+		}
 		return err
 	}