Bundle quick and dirty fix

Rename, remove first line (start with services)
No need to use a new variable name for the error here.

    if _, _, err := r.ReadLine(); err != nil {

or

    _, _, err = r.ReadLine()