diff --git a/examples/lib/exec-send-recv.go b/examples/lib/exec-send-recv.go
index ea77acee..58ddd56c 100644
--- a/examples/lib/exec-send-recv.go
+++ b/examples/lib/exec-send-recv.go
@@ -232,10 +232,7 @@ func Run() error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {
diff --git a/examples/lib/libmgmt-subgraph0.go b/examples/lib/libmgmt-subgraph0.go
index 678fce9b..fc372860 100644
--- a/examples/lib/libmgmt-subgraph0.go
+++ b/examples/lib/libmgmt-subgraph0.go
@@ -239,10 +239,7 @@ func Run() error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {
diff --git a/examples/lib/libmgmt-subgraph1.go b/examples/lib/libmgmt-subgraph1.go
index 553f9b32..a269ad04 100644
--- a/examples/lib/libmgmt-subgraph1.go
+++ b/examples/lib/libmgmt-subgraph1.go
@@ -229,10 +229,7 @@ func Run() error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {
diff --git a/examples/lib/libmgmt1.go b/examples/lib/libmgmt1.go
index acb5fec0..59169b41 100644
--- a/examples/lib/libmgmt1.go
+++ b/examples/lib/libmgmt1.go
@@ -190,10 +190,7 @@ func Run() error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {
diff --git a/examples/lib/libmgmt2.go b/examples/lib/libmgmt2.go
index 26f73b32..f0f52422 100644
--- a/examples/lib/libmgmt2.go
+++ b/examples/lib/libmgmt2.go
@@ -184,10 +184,7 @@ func Run(count uint) error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {
diff --git a/examples/lib/libmgmt3.go b/examples/lib/libmgmt3.go
index cc03b1fe..98e0c2d6 100644
--- a/examples/lib/libmgmt3.go
+++ b/examples/lib/libmgmt3.go
@@ -234,10 +234,7 @@ func Run() error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {
diff --git a/test/shell/libmgmt-change1.go b/test/shell/libmgmt-change1.go
index cf1a9372..0ceeec19 100644
--- a/test/shell/libmgmt-change1.go
+++ b/test/shell/libmgmt-change1.go
@@ -167,10 +167,7 @@ func Run() error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {
diff --git a/test/shell/libmgmt-change2.go b/test/shell/libmgmt-change2.go
index cdfa3b08..9695e884 100644
--- a/test/shell/libmgmt-change2.go
+++ b/test/shell/libmgmt-change2.go
@@ -180,10 +180,7 @@ func Run() error {
 		}
 	}()
 
-	if err := obj.Run(); err != nil {
-		return err
-	}
-	return nil
+	return obj.Run()
 }
 
 func main() {