Merge branch 'master' of https://github.com/meehow/echo into meehow-master

router.go

@@ -218,6 +218,9 @@ func (n *node) findChildWithLabel(l byte) *node {
 }
 
 func (n *node) findChildByKind(t kind) *node {
+	if n == nil {
+		return nil
+	}
 	for _, c := range n.children {
 		if c.kind == t {
 			return c

router_test.go

@@ -756,6 +756,12 @@ func TestRouterPriorityNotFound(t *testing.T) {
 		c.Set("b", 2)
 		return nil
 	})
+	r.Add(http.MethodGet, "/:lang/", func(c Context) error {
+		return nil
+	})
+	r.Add(http.MethodGet, "/:lang/dupa", func(c Context) error {
+		return nil
+	})
 
 	// Find
 	r.Find(http.MethodGet, "/a/foo", c)