more logging improvement (OMS-472)