diff --git a/pkg/plugin/driver/daemonset/daemonset.go b/pkg/plugin/driver/daemonset/daemonset.go
index 936e10903..42ca7be3e 100644
--- a/pkg/plugin/driver/daemonset/daemonset.go
+++ b/pkg/plugin/driver/daemonset/daemonset.go
@@ -227,7 +227,6 @@ func (p *Plugin) listOptions() metav1.ListOptions {
 
 // findDaemonSet gets the daemonset that we created, using a kubernetes label search.
 func (p *Plugin) findDaemonSet(kubeclient kubernetes.Interface) (*appsv1.DaemonSet, error) {
-	// TODO(EKF): Move to v1 in 1.11
 	dsets, err := kubeclient.AppsV1().DaemonSets(p.Namespace).List(p.listOptions())
 	if err != nil {
 		return nil, errors.WithStack(err)
diff --git a/pkg/plugin/driver/job/job.go b/pkg/plugin/driver/job/job.go
index e6e4b645c..4451cb86d 100644
--- a/pkg/plugin/driver/job/job.go
+++ b/pkg/plugin/driver/job/job.go
@@ -208,10 +208,11 @@ func (p *Plugin) monitorOnce(kubeclient kubernetes.Interface, _ []v1.Node) (done
 		return true, nil
 	}
 
-	// Make sure there's a pod
+	// Make sure there's a pod; dont fail the pod if there are issues querying the API server.
 	pod, err := p.findPod(kubeclient)
 	if err != nil {
-		return true, utils.MakeErrorResult(p.GetName(), map[string]interface{}{"error": err.Error()}, plugin.GlobalResult)
+		errlog.LogError(errors.Wrapf(err, "could not find pod created by plugin %v, will retry", p.GetName()))
+		return false, nil
 	}
 
 	// Make sure the pod isn't failing
diff --git a/pkg/plugin/driver/job/job_test.go b/pkg/plugin/driver/job/job_test.go
index e74ca5b43..c14e61b09 100644
--- a/pkg/plugin/driver/job/job_test.go
+++ b/pkg/plugin/driver/job/job_test.go
@@ -377,12 +377,11 @@ func TestMonitorOnce(t *testing.T) {
 			expectDone: true,
 			job:        &Plugin{driver.Base{CleanedUp: true}},
 		}, {
-			desc:               "Missing pod results in error",
-			job:                &Plugin{},
-			podOnServer:        nil,
-			errFromServer:      errors.New("forcedError"),
-			expectErrResultMsg: "forcedError",
-			expectDone:         true,
+			desc:          "Server error results in error being ignored",
+			job:           &Plugin{},
+			podOnServer:   nil,
+			errFromServer: errors.New("forcedError"),
+			expectDone:    false,
 		}, {
 			desc: "Failing pod results in error",
 			job:  &Plugin{},