diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index 101af50460f..7339b6bc4c8 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -458,7 +458,9 @@ func (kl *Kubelet) WatchFile(file string, updateChannel chan<- manifestUpdate) {
 
 	fileInfo, err := os.Stat(file)
 	if err != nil {
-		log.Printf("Error polling file: %#v", err)
+		if !os.IsNotExist(err) {
+			log.Printf("Error polling file: %#v", err)
+		}
 		return
 	}
 	if fileInfo.IsDir() {
@@ -510,14 +512,10 @@ func (kl *Kubelet) ResponseToManifests(response *etcd.Response) ([]api.Container
 func (kl *Kubelet) getKubeletStateFromEtcd(key string, updateChannel chan<- manifestUpdate) error {
 	response, err := kl.Client.Get(key+"/kubelet", true, false)
 	if err != nil {
-		log.Printf("Error on get on %s: %#v", key, err)
-		switch err.(type) {
-		case *etcd.EtcdError:
-			etcdError := err.(*etcd.EtcdError)
-			if etcdError.ErrorCode == 100 {
-				return nil
-			}
+		if util.IsEtcdNotFound(err) {
+			return nil
 		}
+		log.Printf("Error on etcd get of %s: %#v", key, err)
 		return err
 	}
 	manifests, err := kl.ResponseToManifests(response)
diff --git a/pkg/util/fake_etcd_client.go b/pkg/util/fake_etcd_client.go
index 24eca43228d..78da6b0689b 100644
--- a/pkg/util/fake_etcd_client.go
+++ b/pkg/util/fake_etcd_client.go
@@ -71,7 +71,7 @@ func (f *FakeEtcdClient) Get(key string, sort, recursive bool) (*etcd.Response,
 	result := f.Data[key]
 	if result.R == nil {
 		f.t.Errorf("Unexpected get for %s", key)
-		return &etcd.Response{}, &etcd.EtcdError{ErrorCode: 100}
+		return &etcd.Response{}, &etcd.EtcdError{ErrorCode: 100} // Key not found
 	}
 	return result.R, result.E
 }