@@ -651,9 +651,6 @@ func patNextSegment(pattern string) (nodeTyp, string, string, byte, int, int) {
 	}
 
 	// Sanity check
-	if ws >= 0 && ws != len(pattern)-1 {
-		panic("chi: wildcard '*' must be the last value in a route. trim trailing text or use a '{param}' instead")
-	}
 	if ps >= 0 && ws >= 0 && ws < ps {
 		panic("chi: wildcard '*' must be the last pattern in a route, otherwise use a '{param}'")
 	}
@@ -709,7 +706,9 @@ func patNextSegment(pattern string) (nodeTyp, string, string, byte, int, int) {
 	}
 
 	// Wildcard pattern as finale
-	// TODO: should we panic if there is stuff after the * ???
+	if ws < len(pattern)-1 {
+		panic("chi: wildcard '*' must be the last value in a route. trim trailing text or use a '{param}' instead")
+	}
 	return ntCatchAll, "*", "", 0, ws, len(pattern)
 }
Original file line number	Diff line number	Diff line change
`@@ -651,9 +651,6 @@ func patNextSegment(pattern string) (nodeTyp, string, string, byte, int, int) {`
`651`	`651`	`}`
`652`	`652`
`653`	`653`	`// Sanity check`
`654`		`- if ws >= 0 && ws != len(pattern)-1 {`
`655`		`- panic("chi: wildcard '*' must be the last value in a route. trim trailing text or use a '{param}' instead")`
`656`		`- }`
`657`	`654`	`if ps >= 0 && ws >= 0 && ws < ps {`
`658`	`655`	`panic("chi: wildcard '*' must be the last pattern in a route, otherwise use a '{param}'")`
`659`	`656`	`}`
`@@ -709,7 +706,9 @@ func patNextSegment(pattern string) (nodeTyp, string, string, byte, int, int) {`
`709`	`706`	`}`
`710`	`707`
`711`	`708`	`// Wildcard pattern as finale`
`712`		`- // TODO: should we panic if there is stuff after the * ???`
	`709`	`+ if ws < len(pattern)-1 {`
	`710`	`+ panic("chi: wildcard '*' must be the last value in a route. trim trailing text or use a '{param}' instead")`
	`711`	`+ }`
`713`	`712`	`return ntCatchAll, "*", "", 0, ws, len(pattern)`
`714`	`713`	`}`
`715`	`714`