Error reporting clean up part 2