master: Second attempt to fix logging when uncaught exception is not an Error