Merge pull request #2 from enisoc/format-string

Don't pass arbitrary strings as Errorf() format strings.