PMO-2491: improved logging