diff --git a/pkg/drivers/kic/oci/oci.go b/pkg/drivers/kic/oci/oci.go
index 8b3173aaef..49611fa757 100644
--- a/pkg/drivers/kic/oci/oci.go
+++ b/pkg/drivers/kic/oci/oci.go
@@ -49,12 +49,10 @@ func DeleteAllContainersByLabel(ociBin string, label string) []error {
 		glog.Infof("error listing containers by label %q: %v", label, err)
 	}
 	for _, c := range cs {
-		if c != "" {
-			cmd := exec.Command(ociBin, "rm", "-f", "-v", c)
-			if out, err := cmd.CombinedOutput(); err != nil {
-				glog.Infof("error deleting container %s: output: %s", c, string(out))
-				deleteErrs = append(deleteErrs, err)
-			}
+		cmd := exec.Command(ociBin, "rm", "-f", "-v", c)
+		if out, err := cmd.CombinedOutput(); err != nil {
+			glog.Infof("error deleting container %s: output: %s", c, string(out))
+			deleteErrs = append(deleteErrs, err)
 		}
 	}
 	return deleteErrs
@@ -436,7 +434,9 @@ func listContainersByLabel(ociBinary string, label string) ([]string, error) {
 	outs := strings.Split(strings.Replace(string(stdout), "\r", "", -1), "\n")
 	var names []string
 	for _, o := range outs {
-		names = append(names, strings.TrimSpace(o))
+		if strings.TrimSpace(o) != "" {
+			names = append(names, strings.TrimSpace(o))
+		}
 	}
 	return names, err
 }
diff --git a/pkg/drivers/kic/oci/volumes.go b/pkg/drivers/kic/oci/volumes.go
index 3d0c996ef1..b32b81dffd 100644
--- a/pkg/drivers/kic/oci/volumes.go
+++ b/pkg/drivers/kic/oci/volumes.go
@@ -42,12 +42,10 @@ func DeleteAllVolumesByLabel(ociBin string, label string) []error {
 		glog.Infof("error listing volumes by label %q: %v", label, err)
 	}
 	for _, v := range vs {
-		if v != "" {
-			cmd := exec.Command(ociBin, "volume", "rm", "--force", v)
-			if out, err := cmd.CombinedOutput(); err != nil {
-				glog.Infof("error deleting volume %s: output: %s", v, string(out))
-				deleteErrs = append(deleteErrs, err)
-			}
+		cmd := exec.Command(ociBin, "volume", "rm", "--force", v)
+		if out, err := cmd.CombinedOutput(); err != nil {
+			glog.Infof("error deleting volume %s: output: %s", v, string(out))
+			deleteErrs = append(deleteErrs, err)
 		}
 	}
 
@@ -67,7 +65,10 @@ func allVolumesByLabel(ociBin string, label string) ([]string, error) {
 	outs := strings.Split(strings.Replace(string(stdout), "\r", "", -1), "\n")
 	var vols []string
 	for _, o := range outs {
-		vols = append(vols, strings.TrimSpace(o))
+		if strings.TrimSpace(o) != "" {
+			vols = append(vols, strings.TrimSpace(o))
+		}
+
 	}
 	return vols, err
 }