TISTUD-4467: fixed the exceptions seen in the log.