diff --git a/README.md b/README.md
index 7036e719..d119f6b2 100644
--- a/README.md
+++ b/README.md
@@ -48,10 +48,7 @@ func main() {
 	e.GET("/", func(c echo.Context) error {
 		return c.String(http.StatusOK, "Hello, World!")
 	})
-
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err.Error())
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
 ```
 
diff --git a/echo.go b/echo.go
index 8b7836c1..cc251f85 100644
--- a/echo.go
+++ b/echo.go
@@ -29,9 +29,7 @@ Example:
     e.GET("/", hello)
 
     // Start server
-    if err := e.Start(":1323"); err != nil {
-      e.Logger.Fatal(err)
-    }
+    e.Logger.Fatal(e.Start(":1323"))
   }
 
 Learn more at https://echo.labstack.com
diff --git a/recipe/cors/server.go b/recipe/cors/server.go
index bdd0a719..0cc5c345 100644
--- a/recipe/cors/server.go
+++ b/recipe/cors/server.go
@@ -34,7 +34,5 @@ func main() {
 
 	e.GET("/api/users", getUsers)
 
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/crud/server.go b/recipe/crud/server.go
index 12188ac3..fbb5c754 100644
--- a/recipe/crud/server.go
+++ b/recipe/crud/server.go
@@ -71,7 +71,5 @@ func main() {
 	e.DELETE("/users/:id", deleteUser)
 
 	// Start server
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/embed-resources/server.go b/recipe/embed-resources/server.go
index 15512865..e5b0c3db 100644
--- a/recipe/embed-resources/server.go
+++ b/recipe/embed-resources/server.go
@@ -17,7 +17,5 @@ func main() {
 	// servers other static files
 	e.GET("/static/*", echo.WrapHandler(http.StripPrefix("/static/", assetHandler)))
 
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/file-upload/multiple/server.go b/recipe/file-upload/multiple/server.go
index 6f7639d0..cd0f54d3 100644
--- a/recipe/file-upload/multiple/server.go
+++ b/recipe/file-upload/multiple/server.go
@@ -61,7 +61,5 @@ func main() {
 	e.Static("/", "public")
 	e.POST("/upload", upload)
 
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/file-upload/single/server.go b/recipe/file-upload/single/server.go
index 9693afa7..1b84f220 100644
--- a/recipe/file-upload/single/server.go
+++ b/recipe/file-upload/single/server.go
@@ -55,7 +55,5 @@ func main() {
 	e.Static("/", "public")
 	e.POST("/upload", upload)
 
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/google-app-engine/app-standalone.go b/recipe/google-app-engine/app-standalone.go
index 6c8201d2..c3b44dc0 100644
--- a/recipe/google-app-engine/app-standalone.go
+++ b/recipe/google-app-engine/app-standalone.go
@@ -20,7 +20,5 @@ func createMux() *echo.Echo {
 }
 
 func main() {
-	if err := e.Start(":8080"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":8080"))
 }
diff --git a/recipe/graceful-shutdown/server.go b/recipe/graceful-shutdown/server.go
index ee9edaf0..e8dff36e 100644
--- a/recipe/graceful-shutdown/server.go
+++ b/recipe/graceful-shutdown/server.go
@@ -16,7 +16,5 @@ func main() {
 		return ctx.String(200, "OK")
 	})
 
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/hello-world/server.go b/recipe/hello-world/server.go
index feb0d095..06e0718b 100644
--- a/recipe/hello-world/server.go
+++ b/recipe/hello-world/server.go
@@ -21,7 +21,5 @@ func main() {
 	})
 
 	// Start server
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/http2/server.go b/recipe/http2/server.go
index 864fedcd..8db989c4 100644
--- a/recipe/http2/server.go
+++ b/recipe/http2/server.go
@@ -38,7 +38,5 @@ func main() {
 	e := echo.New()
 	e.GET("/request", request)
 	e.GET("/stream", stream)
-	if err := e.StartTLS(":1323", "cert.pem", "key.pem"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.StartTLS(":1323", "cert.pem", "key.pem"))
 }
diff --git a/recipe/jsonp/server.go b/recipe/jsonp/server.go
index ebe0ae7e..ba46bab0 100644
--- a/recipe/jsonp/server.go
+++ b/recipe/jsonp/server.go
@@ -31,7 +31,5 @@ func main() {
 	})
 
 	// Start server
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/jwt/custom-claims/server.go b/recipe/jwt/custom-claims/server.go
index 683a9310..52fc4615 100644
--- a/recipe/jwt/custom-claims/server.go
+++ b/recipe/jwt/custom-claims/server.go
@@ -82,7 +82,5 @@ func main() {
 	r.Use(middleware.JWTWithConfig(config))
 	r.GET("", restricted)
 
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/jwt/map-claims/server.go b/recipe/jwt/map-claims/server.go
index b163cbf9..678be490 100644
--- a/recipe/jwt/map-claims/server.go
+++ b/recipe/jwt/map-claims/server.go
@@ -65,7 +65,5 @@ func main() {
 	r.Use(middleware.JWT([]byte("secret")))
 	r.GET("", restricted)
 
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/middleware/server.go b/recipe/middleware/server.go
index 7218d2d3..2f21df50 100644
--- a/recipe/middleware/server.go
+++ b/recipe/middleware/server.go
@@ -78,7 +78,5 @@ func main() {
 	})
 
 	// Start server
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/streaming-response/server.go b/recipe/streaming-response/server.go
index b80c5551..a3a679ef 100644
--- a/recipe/streaming-response/server.go
+++ b/recipe/streaming-response/server.go
@@ -41,7 +41,5 @@ func main() {
 		}
 		return nil
 	})
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/subdomains/server.go b/recipe/subdomains/server.go
index 1b8e7fd8..ef4f65f9 100644
--- a/recipe/subdomains/server.go
+++ b/recipe/subdomains/server.go
@@ -74,7 +74,5 @@ func main() {
 
 		return
 	})
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/websocket/gorilla/server.go b/recipe/websocket/gorilla/server.go
index 2ef6d147..e9d52dbb 100644
--- a/recipe/websocket/gorilla/server.go
+++ b/recipe/websocket/gorilla/server.go
@@ -43,7 +43,5 @@ func main() {
 	e.Use(middleware.Recover())
 	e.Static("/", "../public")
 	e.GET("/ws", hello)
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/recipe/websocket/net/server.go b/recipe/websocket/net/server.go
index a2f1516a..aa746030 100644
--- a/recipe/websocket/net/server.go
+++ b/recipe/websocket/net/server.go
@@ -37,7 +37,5 @@ func main() {
 	e.Use(middleware.Recover())
 	e.Static("/", "../public")
 	e.GET("/ws", hello)
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
diff --git a/website/content/guide/error-handling.md b/website/content/guide/error-handling.md
index 29aaa30e..a15c7028 100644
--- a/website/content/guide/error-handling.md
+++ b/website/content/guide/error-handling.md
@@ -40,9 +40,7 @@ func main() {
 		}
 	})
 	e.GET("/", welcome)
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err)
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
 
 func welcome(c echo.Context) error {
diff --git a/website/content/index.md b/website/content/index.md
index 8faa967f..70177e98 100644
--- a/website/content/index.md
+++ b/website/content/index.md
@@ -50,10 +50,7 @@ func main() {
 	e.GET("/", func(c echo.Context) error {
 		return c.String(http.StatusOK, "Hello, World!")
 	})
-
-	if err := e.Start(":1323"); err != nil {
-		e.Logger.Fatal(err.Error())
-	}
+	e.Logger.Fatal(e.Start(":1323"))
 }
 ```