Improve code flow.

go vet .
util.go:80: unreachable code