Tweak error returns to work with older Go.

Tweak error returns to work with older Go.

Fixes #14