Don't call errorInfo() if we don't have an object
Merge remote-tracking branch 'upstream/master'