Merge "Cleanup exception logging"