Was broken by CL 12378043. - factored out some error checking code - adjusted error positions R=adonovan TBR=adonovan CC=golang-dev https://golang.org/cl/12401043