3494 improve logging