Fixed the NPE seen in TISTUD-4345.