merge error reporting improvements from 2.3