diff --git a/docs/tutorials/go-built-in.md b/docs/tutorials/go-built-in.md
index 6f5c46830..81325706b 100644
--- a/docs/tutorials/go-built-in.md
+++ b/docs/tutorials/go-built-in.md
@@ -380,13 +380,14 @@ func main() {
  }
 
  node.Start()
+ defer func() {
+  node.Stop()
+  node.Wait()
+ }()
 
  c := make(chan os.Signal, 1)
  signal.Notify(c, os.Interrupt, syscall.SIGTERM)
  <-c
-
- node.Stop()
- node.Wait()
  os.Exit(0)
 }
 
@@ -555,13 +556,14 @@ upon receiving SIGTERM or Ctrl-C.
 
 ```go
 node.Start()
+defer func() {
+ node.Stop()
+ node.Wait()
+}()
 
 c := make(chan os.Signal, 1)
 signal.Notify(c, os.Interrupt, syscall.SIGTERM)
 <-c
-
-node.Stop()
-node.Wait()
 os.Exit(0)
 ```