Error reporting clean up