Suppress exceptions adding certain metadata, minor log cleanup.