Small style fix. Thanks to Alexey Palazhcenko
Use fmt.Errorf to encapsulate errors instead of logging+returning.