TISTUD-5251: prevent the NPE error popup.
Merge pull request #100 from mxia/tistud5251

TISTUD-5251: fix the error popup on the NPEs.