Prefer to explicitly return nil when there is no error for code readability

A common pattern in this repo is:

```go
if err != nil {
  return ..., err
}
return ..., err
```

and we would like to change the last return to explicitly `return ..., nil` for Go readability.