TISTUD-5003: more NPEs in the log.