Reduce complexity.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'
Throw proper exceptions when route can't be resolved.

Signed-off-by: crynobone <crynobone@gmail.com>
Remove unrelevant use.

Signed-off-by: crynobone <crynobone@gmail.com>
Merge branch '2.0'