We just removed setting `this.error` in my branch that got merged in. Does this work around that conflict it was initially causing?