diff --git a/echo.go b/echo.go
index fc7e116f0..d067b8966 100644
--- a/echo.go
+++ b/echo.go
@@ -654,7 +654,7 @@ func (e *Echo) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	// Acquire context
 	c := e.pool.Get().(*context)
 	c.Reset(r, w)
-	h := NotFoundHandler
+	var h func(Context) error
 
 	if e.premiddleware == nil {
 		e.findRouter(r.Host).Find(r.Method, GetPath(r), c)
diff --git a/router.go b/router.go
index 1a2ce561f..a1de2d6e3 100644
--- a/router.go
+++ b/router.go
@@ -624,6 +624,4 @@ func (r *Router) Find(method, path string, c Context) {
 	}
 	ctx.path = currentNode.ppath
 	ctx.pnames = currentNode.pnames
-
-	return
 }