4.0: Improve logging check mode