cleanup exception reporting

cleanup exception reporting