Fix for go1.0.3

I developed the new code under RC1 of go1.1 which no longer requires
a return when the code doesn't reach a code point.