clean up error reporting
clean up a bit