XD-1475 moved comments inside catch block