diff --git a/app_test.go b/app_test.go
index d7be6de391..178fdbea4e 100644
--- a/app_test.go
+++ b/app_test.go
@@ -1089,9 +1089,9 @@ func Test_App_Next_Method(t *testing.T) {
 
 	app.Use(func(c *Ctx) error {
 		utils.AssertEqual(t, MethodGet, c.Method())
-		c.Next()
+		err := c.Next()
 		utils.AssertEqual(t, MethodGet, c.Method())
-		return nil
+		return err
 	})
 
 	resp, err := app.Test(httptest.NewRequest(MethodGet, "/", nil))
diff --git a/middleware/cache/cache_test.go b/middleware/cache/cache_test.go
index 29ca9730f7..216d9cea27 100644
--- a/middleware/cache/cache_test.go
+++ b/middleware/cache/cache_test.go
@@ -391,32 +391,32 @@ func Test_Cache_WithHead(t *testing.T) {
 func Test_Cache_WithHeadThenGet(t *testing.T) {
 	app := fiber.New()
 	app.Use(New())
-	app.Get("/get", func(c *fiber.Ctx) error {
+	app.Get("/", func(c *fiber.Ctx) error {
 		return c.SendString(c.Query("cache"))
 	})
 
-	headResp, err := app.Test(httptest.NewRequest("HEAD", "/head?cache=123", nil))
+	headResp, err := app.Test(httptest.NewRequest("HEAD", "/?cache=123", nil))
 	utils.AssertEqual(t, nil, err)
 	headBody, err := ioutil.ReadAll(headResp.Body)
 	utils.AssertEqual(t, nil, err)
 	utils.AssertEqual(t, "", string(headBody))
 	utils.AssertEqual(t, cacheMiss, headResp.Header.Get("X-Cache"))
 
-	headResp, err = app.Test(httptest.NewRequest("HEAD", "/head?cache=123", nil))
+	headResp, err = app.Test(httptest.NewRequest("HEAD", "/?cache=123", nil))
 	utils.AssertEqual(t, nil, err)
 	headBody, err = ioutil.ReadAll(headResp.Body)
 	utils.AssertEqual(t, nil, err)
 	utils.AssertEqual(t, "", string(headBody))
 	utils.AssertEqual(t, cacheHit, headResp.Header.Get("X-Cache"))
 
-	getResp, err := app.Test(httptest.NewRequest("GET", "/get?cache=123", nil))
+	getResp, err := app.Test(httptest.NewRequest("GET", "/?cache=123", nil))
 	utils.AssertEqual(t, nil, err)
 	getBody, err := ioutil.ReadAll(getResp.Body)
 	utils.AssertEqual(t, nil, err)
 	utils.AssertEqual(t, "123", string(getBody))
 	utils.AssertEqual(t, cacheMiss, getResp.Header.Get("X-Cache"))
 
-	getResp, err = app.Test(httptest.NewRequest("GET", "/get?cache=123", nil))
+	getResp, err = app.Test(httptest.NewRequest("GET", "/?cache=123", nil))
 	utils.AssertEqual(t, nil, err)
 	getBody, err = ioutil.ReadAll(getResp.Body)
 	utils.AssertEqual(t, nil, err)
diff --git a/middleware/logger/logger_test.go b/middleware/logger/logger_test.go
index 3d564cfb19..0e0ba1d63c 100644
--- a/middleware/logger/logger_test.go
+++ b/middleware/logger/logger_test.go
@@ -148,7 +148,7 @@ func Test_Logger_All(t *testing.T) {
 	utils.AssertEqual(t, nil, err)
 	utils.AssertEqual(t, fiber.StatusNotFound, resp.StatusCode)
 
-	expected := fmt.Sprintf("%dHost=example.comhttp0.0.0.0example.com/?foo=bar/%s%s%s%s%s%s%s%s%s-", os.Getpid(), cBlack, cRed, cGreen, cYellow, cBlue, cMagenta, cCyan, cWhite, cReset)
+	expected := fmt.Sprintf("%dHost=example.comhttp0.0.0.0example.com/?foo=bar/%s%s%s%s%s%s%s%s%sCannot GET /", os.Getpid(), cBlack, cRed, cGreen, cYellow, cBlue, cMagenta, cCyan, cWhite, cReset)
 	utils.AssertEqual(t, expected, buf.String())
 }
 
diff --git a/router.go b/router.go
index 53150e21c7..5e037da412 100644
--- a/router.go
+++ b/router.go
@@ -134,8 +134,7 @@ func (app *App) next(c *Ctx) (match bool, err error) {
 	}
 
 	// If c.Next() does not match, return 404
-	_ = c.SendStatus(StatusNotFound)
-	_ = c.SendString("Cannot " + c.method + " " + c.pathOriginal)
+	err = NewError(StatusNotFound, "Cannot " + c.method + " " + c.pathOriginal)
 
 	// If no match, scan stack again if other methods match the request
 	// Moved from app.handler because middleware may break the route chain