[181465] fixing NPE
2 files changed