[#KOD-348] : Catch logs before return