Fix last next.ifError.
Merge branch 'issue-31' into issue-32