More idiomatic Go

Ref: https://groups.google.com/forum/#!searchin/golang-nuts/err$20$3D$3D$20nil/golang-nuts/UfOBIP83tmk/SP6VBZrZUh8J